[lib] Reintroduce RawThreadInfo (`[Legacy/MinimallyEncoded]RawThrea…

…dInfo`) Summary: Similar to D10068 and D10072 and D10074, but for `RawThreadInfo`. --- Depends on D10077 Test Plan: `flow`/CI/etc. Reviewers: ashoat, ginsu, tomek, rohan Reviewed By: ginsu Differential Revision: https://phab.comm.dev/D10078
CommE2E · Nov 29, 2023 · bfd6ef1 · bfd6ef1
1 parent 819fb9e
commit bfd6ef1
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 339 deletions.
diff --git a/lib/hooks/child-threads.js b/lib/hooks/child-threads.js
@@ -14,11 +14,8 @@ import { useGlobalThreadSearchIndex } from '../selectors/nav-selectors.js';
 import { childThreadInfos } from '../selectors/thread-selectors.js';
 import { threadInChatList } from '../shared/thread-utils.js';
 import threadWatcher from '../shared/thread-watcher.js';
-import type {
-  MinimallyEncodedThreadInfo,
-  MinimallyEncodedRawThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
-import type { ThreadInfo, LegacyRawThreadInfo } from '../types/thread-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
+import type { ThreadInfo, RawThreadInfo } from '../types/thread-types.js';
 import { useDispatchActionPromise } from '../utils/action-utils.js';
 import { useSelector } from '../utils/redux-utils.js';
 
@@ -44,14 +41,7 @@ function useFilteredChildThreads(
   }, [childThreads, predicate]);
 
   const filterSubchannels = React.useCallback(
-    (
-      thread: ?(
-        | ThreadInfo
-        | LegacyRawThreadInfo
-        | MinimallyEncodedThreadInfo
-        | MinimallyEncodedRawThreadInfo
-      ),
-    ) => {
+    (thread: ?(ThreadInfo | RawThreadInfo | MinimallyEncodedThreadInfo)) => {
       const candidateThreadID = thread?.id;
       if (!candidateThreadID) {
         return false;

diff --git a/lib/hooks/search-threads.js b/lib/hooks/search-threads.js
@@ -10,14 +10,11 @@ import { useThreadSearchIndex } from '../selectors/nav-selectors.js';
 import { sidebarInfoSelector } from '../selectors/thread-selectors.js';
 import { threadIsChannel } from '../shared/thread-utils.js';
 import type { SetState } from '../types/hook-types.js';
-import type {
-  MinimallyEncodedRawThreadInfo,
-  MinimallyEncodedThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
 import type {
   SidebarInfo,
   ThreadInfo,
-  LegacyRawThreadInfo,
+  RawThreadInfo,
 } from '../types/thread-types.js';
 import { useSelector } from '../utils/redux-utils.js';
 
@@ -107,14 +104,8 @@ function useSearchSubchannels(
   threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
 ): SearchThreadsResult<ChatThreadItem> {
   const filterFunc = React.useCallback(
-    (
-      thread: ?(
-        | ThreadInfo
-        | LegacyRawThreadInfo
-        | MinimallyEncodedThreadInfo
-        | MinimallyEncodedRawThreadInfo
-      ),
-    ) => threadIsChannel(thread) && thread?.parentThreadID === threadInfo.id,
+    (thread: ?(ThreadInfo | MinimallyEncodedThreadInfo | RawThreadInfo)) =>
+      threadIsChannel(thread) && thread?.parentThreadID === threadInfo.id,
     [threadInfo.id],
   );
   const childThreadInfos = useFilteredChatListData(filterFunc);

diff --git a/lib/selectors/chat-selectors.js b/lib/selectors/chat-selectors.js
@@ -35,15 +35,12 @@ import {
   type LocalMessageInfo,
   isComposableMessageType,
 } from '../types/message-types.js';
-import type {
-  MinimallyEncodedRawThreadInfo,
-  MinimallyEncodedThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
 import type { BaseAppState } from '../types/redux-types.js';
 import { threadTypes } from '../types/thread-types-enum.js';
 import {
   type ThreadInfo,
-  type LegacyRawThreadInfo,
+  type RawThreadInfo,
   type SidebarInfo,
   maxReadSidebars,
   maxUnreadSidebars,
@@ -232,12 +229,7 @@ function useFlattenedChatListData(): $ReadOnlyArray<ChatThreadItem> {
 
 function useFilteredChatListData(
   filterFunction: (
-    threadInfo: ?(
-      | ThreadInfo
-      | LegacyRawThreadInfo
-      | MinimallyEncodedThreadInfo
-      | MinimallyEncodedRawThreadInfo
-    ),
+    threadInfo: ?(ThreadInfo | MinimallyEncodedThreadInfo | RawThreadInfo),
   ) => boolean,
 ): $ReadOnlyArray<ChatThreadItem> {
   const threadInfos = useSelector(threadInfoSelector);
@@ -264,12 +256,7 @@ function getChatThreadItems(
   messageInfos: { +[id: string]: ?MessageInfo },
   sidebarInfos: { +[id: string]: $ReadOnlyArray<SidebarInfo> },
   filterFunction: (
-    threadInfo: ?(
-      | ThreadInfo
-      | LegacyRawThreadInfo
-      | MinimallyEncodedThreadInfo
-      | MinimallyEncodedRawThreadInfo
-    ),
+    threadInfo: ?(ThreadInfo | MinimallyEncodedThreadInfo | RawThreadInfo),
   ) => boolean,
 ): $ReadOnlyArray<ChatThreadItem> {
   return _flow(

diff --git a/lib/selectors/nav-selectors.js b/lib/selectors/nav-selectors.js
@@ -12,13 +12,10 @@ import {
   defaultCalendarQuery,
 } from '../types/entry-types.js';
 import type { CalendarFilter } from '../types/filter-types.js';
-import type {
-  MinimallyEncodedRawThreadInfo,
-  MinimallyEncodedThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
 import type { BaseNavInfo } from '../types/nav-types.js';
 import type { BaseAppState } from '../types/redux-types.js';
-import type { LegacyRawThreadInfo, ThreadInfo } from '../types/thread-types.js';
+import type { RawThreadInfo, ThreadInfo } from '../types/thread-types.js';
 import type { UserInfo } from '../types/user-types.js';
 import { getConfig } from '../utils/config.js';
 import { values } from '../utils/objects.js';
@@ -84,10 +81,7 @@ const useENSNamesOptions = { allAtOnce: true };
 
 function useThreadSearchIndex(
   threadInfos: $ReadOnlyArray<
-    | LegacyRawThreadInfo
-    | ThreadInfo
-    | MinimallyEncodedRawThreadInfo
-    | MinimallyEncodedThreadInfo,
+    RawThreadInfo | ThreadInfo | MinimallyEncodedThreadInfo,
   >,
 ): SearchIndex {
   const userInfos = useSelector(state => state.userStore.userInfos);

diff --git a/lib/shared/avatar-utils.js b/lib/shared/avatar-utils.js
@@ -16,15 +16,9 @@ import type {
   ResolvedClientAvatar,
   GenericUserInfoWithAvatar,
 } from '../types/avatar-types.js';
-import type {
-  MinimallyEncodedRawThreadInfo,
-  MinimallyEncodedThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
 import { threadTypes } from '../types/thread-types-enum.js';
-import {
-  type LegacyRawThreadInfo,
-  type ThreadInfo,
-} from '../types/thread-types.js';
+import type { ThreadInfo, RawThreadInfo } from '../types/thread-types.js';
 import type { UserInfos } from '../types/user-types.js';
 import { useSelector } from '../utils/redux-utils.js';
 import { ashoatKeyserverID } from '../utils/validation-utils.js';
@@ -277,11 +271,7 @@ function getAvatarForUser(user: ?GenericUserInfoWithAvatar): ClientAvatar {
 }
 
 function getUserAvatarForThread(
-  threadInfo:
-    | LegacyRawThreadInfo
-    | ThreadInfo
-    | MinimallyEncodedRawThreadInfo
-    | MinimallyEncodedThreadInfo,
+  threadInfo: RawThreadInfo | ThreadInfo | MinimallyEncodedThreadInfo,
   viewerID: ?string,
   userInfos: UserInfos,
 ): ClientAvatar {
@@ -307,11 +297,7 @@ function getUserAvatarForThread(
 }
 
 function getAvatarForThread(
-  thread:
-    | LegacyRawThreadInfo
-    | ThreadInfo
-    | MinimallyEncodedThreadInfo
-    | MinimallyEncodedRawThreadInfo,
+  thread: RawThreadInfo | ThreadInfo | MinimallyEncodedThreadInfo,
   containingThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
 ): ClientAvatar {
   if (thread.avatar) {
@@ -328,11 +314,7 @@ function getAvatarForThread(
 }
 
 function useAvatarForThread(
-  thread:
-    | LegacyRawThreadInfo
-    | ThreadInfo
-    | MinimallyEncodedRawThreadInfo
-    | MinimallyEncodedThreadInfo,
+  thread: RawThreadInfo | ThreadInfo | MinimallyEncodedThreadInfo,
 ): ClientAvatar {
   const containingThreadID = thread.containingThreadID;
   const containingThreadInfo = useSelector(state =>

diff --git a/lib/shared/message-utils.js b/lib/shared/message-utils.js
@@ -41,11 +41,8 @@ import type {
   RawReactionMessageInfo,
   ReactionMessageInfo,
 } from '../types/messages/reaction.js';
-import type {
-  MinimallyEncodedRawThreadInfo,
-  MinimallyEncodedThreadInfo,
-} from '../types/minimally-encoded-thread-permissions-types.js';
-import type { LegacyRawThreadInfo, ThreadInfo } from '../types/thread-types.js';
+import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
+import type { RawThreadInfo, ThreadInfo } from '../types/thread-types.js';
 import type { UserInfos } from '../types/user-types.js';
 import { extractKeyserverIDFromID } from '../utils/action-utils.js';
 import {
@@ -683,11 +680,7 @@ function isInvalidPinSource(
 
 function isInvalidPinSourceForThread(
   messageInfo: RawMessageInfo | MessageInfo,
-  threadInfo:
-    | LegacyRawThreadInfo
-    | ThreadInfo
-    | MinimallyEncodedRawThreadInfo
-    | MinimallyEncodedThreadInfo,
+  threadInfo: RawThreadInfo | ThreadInfo | MinimallyEncodedThreadInfo,
 ): boolean {
   const isValidPinSource = !isInvalidPinSource(messageInfo);
   const isFirstMessageInSidebar = threadInfo.sourceMessageID === messageInfo.id;