[lib] Use RawThreadInfos type everywhere

Summary:
In some places we were using `RawThreadInfos`, in others we were using `{ +[id: string]: RawThreadInfo }`, and in others we were using `{ +[threadID: string]: RawThreadInfo }`.

This is just for convenience when refactoring. Searching for `RawThreadInfos` or using "go to usages" will actually show us all uses of this type: https://blob.sh/68308a.png

Test Plan: NA

Reviewers: ashoat, ginsu, tomek, rohan

Reviewed By: ashoat

Subscribers: wyilio

Differential Revision: https://phab.comm.dev/D9787

keyserver/src/creators/update-creator.js

@@ -26,7 +26,7 @@ import {
   redisMessageTypes,
   type NewUpdatesRedisMessage,
 } from 'lib/types/redis-types.js';
-import type { RawThreadInfo } from 'lib/types/thread-types.js';
+import type { RawThreadInfos } from 'lib/types/thread-types';
 import {
   type ServerUpdateInfo,
   type UpdateData,
@@ -84,7 +84,7 @@ export type ViewerInfo =
       viewer: Viewer,
       calendarQuery: ?CalendarQuery,
       updatesForCurrentSession?: UpdatesForCurrentSession,
-      threadInfos: { +[id: string]: RawThreadInfo },
+      threadInfos: RawThreadInfos,
     };
 const defaultUpdateCreationResult = { viewerUpdates: [], userInfos: {} };
 const sortFunction = (

lib/actions/user-actions.js

@@ -32,7 +32,7 @@ import type {
   SubscriptionUpdateRequest,
   SubscriptionUpdateResult,
 } from '../types/subscription-types.js';
-import type { RawThreadInfo } from '../types/thread-types';
+import type { RawThreadInfos } from '../types/thread-types';
 import type {
   UserInfo,
   PasswordUpdate,
@@ -245,7 +245,7 @@ const logIn =
 
     const userInfosArrays = [];
 
-    let threadInfos: { +[id: string]: RawThreadInfo } = {};
+    let threadInfos: RawThreadInfos = {};
     const calendarResult = {
       calendarQuery: logInInfo.calendarQuery,
       rawEntryInfos: [],

lib/ops/thread-store-ops.js

@@ -4,6 +4,7 @@ import { type BaseStoreOpsHandlers } from './base-ops.js';
 import type {
   ClientDBThreadInfo,
   RawThreadInfo,
+  RawThreadInfos,
   ThreadStore,
 } from '../types/thread-types.js';
 import {
@@ -44,7 +45,7 @@ export const threadStoreOpsHandlers: BaseStoreOpsHandlers<
   ThreadStore,
   ThreadStoreOperation,
   ClientDBThreadStoreOperation,
-  { +[id: string]: RawThreadInfo },
+  RawThreadInfos,
   ClientDBThreadInfo,
 > = {
   processStoreOperations(

lib/reducers/calendar-filters-reducer.js

@@ -37,7 +37,7 @@ import {
   fullStateSyncActionType,
   incrementalStateSyncActionType,
 } from '../types/socket-types.js';
-import type { RawThreadInfo, ThreadStore } from '../types/thread-types.js';
+import type { RawThreadInfos, ThreadStore } from '../types/thread-types.js';
 import {
   type ClientUpdateInfo,
   processUpdatesActionType,
@@ -158,7 +158,7 @@ function updateFilterListFromUpdateInfos(
 
 function removeDeletedThreadIDsFromFilterList(
   state: $ReadOnlyArray<CalendarFilter>,
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): $ReadOnlyArray<CalendarFilter> {
   const currentlyFilteredIDs = filteredThreadIDs(state);
   if (!currentlyFilteredIDs) {

lib/reducers/entry-reducer.js

@@ -54,7 +54,7 @@ import {
   fullStateSyncActionType,
   incrementalStateSyncActionType,
 } from '../types/socket-types.js';
-import { type RawThreadInfo } from '../types/thread-types.js';
+import { type RawThreadInfos } from '../types/thread-types.js';
 import {
   type ClientUpdateInfo,
   processUpdatesActionType,
@@ -90,7 +90,7 @@ function mergeNewEntryInfos(
   currentEntryInfos: { +[id: string]: RawEntryInfo },
   currentDaysToEntries: ?{ +[day: string]: string[] },
   newEntryInfos: $ReadOnlyArray<RawEntryInfo>,
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ) {
   const mergedEntryInfos = {};
   let someEntryUpdated = false;
@@ -163,7 +163,7 @@ function mergeNewEntryInfos(
 function reduceEntryInfos(
   entryStore: EntryStore,
   action: BaseAction,
-  newThreadInfos: { +[id: string]: RawThreadInfo },
+  newThreadInfos: RawThreadInfos,
 ): [EntryStore, $ReadOnlyArray<ClientEntryInconsistencyReportCreationRequest>] {
   const { entryInfos, daysToEntries, lastUserInteractionCalendar } = entryStore;
   if (

lib/reducers/message-reducer.js

@@ -93,7 +93,7 @@ import {
   incrementalStateSyncActionType,
 } from '../types/socket-types.js';
 import { threadPermissions } from '../types/thread-permission-types.js';
-import { type RawThreadInfo } from '../types/thread-types.js';
+import type { RawThreadInfo, RawThreadInfos } from '../types/thread-types.js';
 import {
   type ClientUpdateInfo,
   processUpdatesActionType,
@@ -146,7 +146,7 @@ function freshMessageStore(
   messageInfos: $ReadOnlyArray<RawMessageInfo>,
   truncationStatus: { [threadID: string]: MessageTruncationStatus },
   currentAsOf: number,
-  threadInfos: { +[threadID: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): FreshMessageStoreResult {
   const unshimmed = unshimMessageInfos(messageInfos);
   const orderedMessageInfos = sortMessageInfoList(unshimmed);
@@ -212,7 +212,7 @@ type ReassignmentResult = {
 
 function reassignMessagesToRealizedThreads(
   messageStore: MessageStore,
-  threadInfos: { +[threadID: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): ReassignmentResult {
   const pendingToRealizedThreadIDs =
     pendingToRealizedThreadIDsSelector(threadInfos);
@@ -305,7 +305,7 @@ function mergeNewMessages(
   oldMessageStore: MessageStore,
   newMessageInfos: $ReadOnlyArray<RawMessageInfo>,
   truncationStatus: { [threadID: string]: MessageTruncationStatus },
-  threadInfos: { +[threadID: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): MergeNewMessagesResult {
   const {
     messageStoreOperations: updateWithLatestThreadInfosOps,
@@ -623,7 +623,7 @@ type UpdateMessageStoreWithLatestThreadInfosResult = {
 };
 function updateMessageStoreWithLatestThreadInfos(
   messageStore: MessageStore,
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): UpdateMessageStoreWithLatestThreadInfosResult {
   const messageStoreOperations: MessageStoreOperation[] = [];
   const {
@@ -691,7 +691,7 @@ function updateMessageStoreWithLatestThreadInfos(
 
 function ensureRealizedThreadIDIsUsedWhenPossible<T: RawMessageInfo>(
   payload: T,
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): T {
   const pendingToRealizedThreadIDs =
     pendingToRealizedThreadIDsSelector(threadInfos);
@@ -711,7 +711,7 @@ type ReduceMessageStoreResult = {
 function reduceMessageStore(
   messageStore: MessageStore,
   action: BaseAction,
-  newThreadInfos: { +[id: string]: RawThreadInfo },
+  newThreadInfos: RawThreadInfos,
 ): ReduceMessageStoreResult {
   if (
     action.type === logInActionTypes.success ||

lib/reducers/thread-reducer.js

@@ -41,7 +41,7 @@ import {
   fullStateSyncActionType,
   incrementalStateSyncActionType,
 } from '../types/socket-types.js';
-import type { RawThreadInfo, ThreadStore } from '../types/thread-types.js';
+import type { RawThreadInfos, ThreadStore } from '../types/thread-types.js';
 import {
   type ClientUpdateInfo,
   processUpdatesActionType,
@@ -52,7 +52,7 @@ const { processStoreOperations: processThreadStoreOperations } =
   threadStoreOpsHandlers;
 
 function generateOpsForThreadUpdates(
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
   payload: {
     +updatesResult: { +newUpdates: $ReadOnlyArray<ClientUpdateInfo>, ... },
     ...

lib/selectors/thread-selectors.js

@@ -51,6 +51,7 @@ import {
   type RawThreadInfo,
   type RelativeMemberInfo,
   type SidebarInfo,
+  type RawThreadInfos,
 } from '../types/thread-types.js';
 import { dateString, dateFromString } from '../utils/date-utils.js';
 import { values } from '../utils/objects.js';
@@ -273,7 +274,7 @@ const sidebarInfoSelector: (state: BaseAppState<>) => {
 
 const unreadCount: (state: BaseAppState<>) => number = createSelector(
   (state: BaseAppState<>) => state.threadStore.threadInfos,
-  (threadInfos: { +[id: string]: RawThreadInfo }): number =>
+  (threadInfos: RawThreadInfos): number =>
     values(threadInfos).filter(
       threadInfo =>
         threadInHomeChatList(threadInfo) && threadInfo.currentUser.unread,
@@ -282,7 +283,7 @@ const unreadCount: (state: BaseAppState<>) => number = createSelector(
 
 const unreadBackgroundCount: (state: BaseAppState<>) => number = createSelector(
   (state: BaseAppState<>) => state.threadStore.threadInfos,
-  (threadInfos: { +[id: string]: RawThreadInfo }): number =>
+  (threadInfos: RawThreadInfos): number =>
     values(threadInfos).filter(
       threadInfo =>
         threadInBackgroundChatList(threadInfo) && threadInfo.currentUser.unread,
@@ -351,7 +352,7 @@ const otherUsersButNoOtherAdmins: (
 
 function mostRecentlyReadThread(
   messageStore: MessageStore,
-  threadInfos: { +[id: string]: RawThreadInfo },
+  threadInfos: RawThreadInfos,
 ): ?string {
   let mostRecent = null;
   for (const threadID in threadInfos) {
@@ -393,7 +394,7 @@ const threadInfoFromSourceMessageIDSelector: (state: BaseAppState<>) => {
   (state: BaseAppState<>) => state.threadStore.threadInfos,
   threadInfoSelector,
   (
-    rawThreadInfos: { +[id: string]: RawThreadInfo },
+    rawThreadInfos: RawThreadInfos,
     threadInfos: { +[id: string]: ThreadInfo },
   ) => {
     const pendingToRealizedThreadIDs =
@@ -408,11 +409,11 @@ const threadInfoFromSourceMessageIDSelector: (state: BaseAppState<>) => {
     return result;
   },
 );
-const pendingToRealizedThreadIDsSelector: (rawThreadInfos: {
-  +[id: string]: RawThreadInfo,
-}) => $ReadOnlyMap<string, string> = createSelector(
-  (rawThreadInfos: { +[id: string]: RawThreadInfo }) => rawThreadInfos,
-  (rawThreadInfos: { +[id: string]: RawThreadInfo }) => {
+const pendingToRealizedThreadIDsSelector: (
+  rawThreadInfos: RawThreadInfos,
+) => $ReadOnlyMap<string, string> = createSelector(
+  (rawThreadInfos: RawThreadInfos) => rawThreadInfos,
+  (rawThreadInfos: RawThreadInfos) => {
     const result = new Map();
     for (const threadID in rawThreadInfos) {
       const rawThreadInfo = rawThreadInfos[threadID];

lib/types/account-types.js

@@ -15,7 +15,7 @@ import {
   type GenericMessagesResult,
 } from './message-types.js';
 import type { PreRequestUserState } from './session-types.js';
-import { type RawThreadInfo } from './thread-types.js';
+import { type RawThreadInfos } from './thread-types.js';
 import {
   type UserInfo,
   type LoggedOutUserInfo,
@@ -69,15 +69,15 @@ export type RegisterResponse = {
   rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
   currentUserInfo: LoggedInUserInfo,
   cookieChange: {
-    threadInfos: { +[id: string]: RawThreadInfo },
+    threadInfos: RawThreadInfos,
     userInfos: $ReadOnlyArray<UserInfo>,
   },
 };
 
 export type RegisterResult = {
   +currentUserInfo: LoggedInUserInfo,
   +rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
-  +threadInfos: { +[id: string]: RawThreadInfo },
+  +threadInfos: RawThreadInfos,
   +userInfos: $ReadOnlyArray<UserInfo>,
   +calendarQuery: CalendarQuery,
 };
@@ -142,14 +142,14 @@ export type LogInResponse = {
   +rawEntryInfos?: ?$ReadOnlyArray<RawEntryInfo>,
   +serverTime: number,
   +cookieChange: {
-    +threadInfos: { +[id: string]: RawThreadInfo },
+    +threadInfos: RawThreadInfos,
     +userInfos: $ReadOnlyArray<UserInfo>,
   },
   +notAcknowledgedPolicies?: $ReadOnlyArray<PolicyType>,
 };
 
 export type LogInResult = {
-  +threadInfos: { +[id: string]: RawThreadInfo },
+  +threadInfos: RawThreadInfos,
   +currentUserInfo: LoggedInUserInfo,
   +messagesResult: GenericMessagesResult,
   +userInfos: $ReadOnlyArray<UserInfo>,

lib/types/report-types.js

@@ -7,7 +7,7 @@ import { type PlatformDetails } from './device-types.js';
 import { type RawEntryInfo, type CalendarQuery } from './entry-types.js';
 import { type MediaMission } from './media-types.js';
 import type { AppState, BaseAction } from './redux-types.js';
-import { type RawThreadInfo } from './thread-types.js';
+import { type RawThreadInfos } from './thread-types.js';
 import type { UserInfo, UserInfos } from './user-types.js';
 import { tPlatformDetails, tShape } from '../utils/validation-utils.js';
 
@@ -71,10 +71,10 @@ export type ActionSummary = {
 };
 export type ThreadInconsistencyReportShape = {
   +platformDetails: PlatformDetails,
-  +beforeAction: { +[id: string]: RawThreadInfo },
+  +beforeAction: RawThreadInfos,
   +action: BaseAction,
-  +pollResult?: { +[id: string]: RawThreadInfo },
-  +pushResult: { +[id: string]: RawThreadInfo },
+  +pollResult?: RawThreadInfos,
+  +pushResult: RawThreadInfos,
   +lastActionTypes?: $ReadOnlyArray<$PropertyType<BaseAction, 'type'>>,
   +lastActions?: $ReadOnlyArray<ActionSummary>,
   +time?: number,
@@ -142,9 +142,9 @@ export type ReportCreationRequest =
 
 export type ClientThreadInconsistencyReportShape = {
   +platformDetails: PlatformDetails,
-  +beforeAction: { +[id: string]: RawThreadInfo },
+  +beforeAction: RawThreadInfos,
   +action: BaseAction,
-  +pushResult: { +[id: string]: RawThreadInfo },
+  +pushResult: RawThreadInfos,
   +lastActions: $ReadOnlyArray<ActionSummary>,
   +time: number,
 };

lib/types/session-types.js

@@ -5,7 +5,7 @@ import t, { type TInterface } from 'tcomb';
 import type { LogInActionSource } from './account-types.js';
 import type { Shape } from './core.js';
 import type { CalendarQuery } from './entry-types.js';
-import type { RawThreadInfo } from './thread-types.js';
+import type { RawThreadInfos } from './thread-types.js';
 import {
   type UserInfo,
   type CurrentUserInfo,
@@ -53,14 +53,14 @@ export type CookieType = $Values<typeof cookieTypes>;
 export type ServerSessionChange =
   | {
       cookieInvalidated: false,
-      threadInfos: { +[id: string]: RawThreadInfo },
+      threadInfos: RawThreadInfos,
       userInfos: $ReadOnlyArray<UserInfo>,
       sessionID?: null | string,
       cookie?: string,
     }
   | {
       cookieInvalidated: true,
-      threadInfos: { +[id: string]: RawThreadInfo },
+      threadInfos: RawThreadInfos,
       userInfos: $ReadOnlyArray<UserInfo>,
       currentUserInfo: LoggedOutUserInfo,
       sessionID?: null | string,

lib/types/socket-types.js

@@ -33,7 +33,7 @@ import {
   type ClientClientResponse,
 } from './request-types.js';
 import type { SessionState, SessionIdentification } from './session-types.js';
-import { type RawThreadInfo, rawThreadInfoValidator } from './thread-types.js';
+import { rawThreadInfoValidator, type RawThreadInfos } from './thread-types.js';
 import {
   type ClientUpdatesResult,
   type ClientUpdatesResultWithUserInfos,
@@ -183,7 +183,7 @@ export const stateSyncPayloadTypes = Object.freeze({
 export const fullStateSyncActionType = 'FULL_STATE_SYNC';
 export type BaseFullStateSync = {
   +messagesResult: MessagesResponse,
-  +threadInfos: { +[id: string]: RawThreadInfo },
+  +threadInfos: RawThreadInfos,
   +rawEntryInfos: $ReadOnlyArray<RawEntryInfo>,
   +userInfos: $ReadOnlyArray<UserInfo>,
   +updatesCurrentAsOf: number,

lib/types/thread-types.js

@@ -215,7 +215,7 @@ export type ServerThreadInfo = {
 };
 
 export type ThreadStore = {
-  +threadInfos: { +[id: string]: RawThreadInfo },
+  +threadInfos: RawThreadInfos,
 };
 export const threadStoreValidator: TInterface<ThreadStore> =
   tShape<ThreadStore>({
@@ -459,7 +459,7 @@ export const maxReadSidebars = 3;
 // in the chat tab if every one of the displayed sidebars is unread
 export const maxUnreadSidebars = 5;
 
-export type ThreadStoreThreadInfos = { +[id: string]: RawThreadInfo };
+export type ThreadStoreThreadInfos = RawThreadInfos;
 
 export type ChatMentionCandidates = { +[id: string]: ResolvedThreadInfo };
 export type ChatMentionCandidatesObj = {

native/redux/edit-thread-permission-migration.js

@@ -6,6 +6,7 @@ import type {
   ThreadCurrentUserInfo,
   RawThreadInfo,
   RoleInfo,
+  RawThreadInfos,
 } from 'lib/types/thread-types.js';
 
 function addDetailedThreadEditPermissionsToUser<
@@ -59,7 +60,7 @@ function addDetailedThreadEditPermissionsToRole(
 
 function migrateThreadStoreForEditThreadPermissions(threadInfos: {
   +[id: string]: RawThreadInfo,
-}): { +[id: string]: RawThreadInfo } {
+}): RawThreadInfos {
   const newThreadInfos = {};
   for (const threadID in threadInfos) {
     const threadInfo: RawThreadInfo = threadInfos[threadID];