diff --git a/lib/actions/user-actions.js b/lib/actions/user-actions.js --- a/lib/actions/user-actions.js +++ b/lib/actions/user-actions.js @@ -38,7 +38,7 @@ SubscriptionUpdateRequest, SubscriptionUpdateResult, } from '../types/subscription-types.js'; -import type { LegacyRawThreadInfos } from '../types/thread-types'; +import type { RawThreadInfos } from '../types/thread-types'; import type { UserInfo, PasswordUpdate, @@ -264,7 +264,7 @@ const userInfosArrays = []; - let threadInfos: LegacyRawThreadInfos = {}; + let threadInfos: RawThreadInfos = {}; const calendarResult: WritableCalendarResult = { calendarQuery: logInInfo.calendarQuery, rawEntryInfos: [], diff --git a/lib/ops/thread-store-ops.js b/lib/ops/thread-store-ops.js --- a/lib/ops/thread-store-ops.js +++ b/lib/ops/thread-store-ops.js @@ -3,8 +3,8 @@ import { type BaseStoreOpsHandlers } from './base-ops.js'; import type { ClientDBThreadInfo, - LegacyRawThreadInfo, - LegacyRawThreadInfos, + RawThreadInfo, + RawThreadInfos, ThreadStore, } from '../types/thread-types.js'; import { @@ -23,7 +23,7 @@ export type ReplaceThreadOperation = { +type: 'replace', - +payload: { +id: string, +threadInfo: LegacyRawThreadInfo }, + +payload: { +id: string, +threadInfo: RawThreadInfo }, }; export type ThreadStoreOperation = @@ -45,7 +45,7 @@ ThreadStore, ThreadStoreOperation, ClientDBThreadStoreOperation, - LegacyRawThreadInfos, + RawThreadInfos, ClientDBThreadInfo, > = { processStoreOperations( @@ -87,7 +87,7 @@ }, translateClientDBData(data: $ReadOnlyArray): { - +[id: string]: LegacyRawThreadInfo, + +[id: string]: RawThreadInfo, } { return Object.fromEntries( data.map((dbThreadInfo: ClientDBThreadInfo) => [ diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js --- a/lib/reducers/message-reducer.js +++ b/lib/reducers/message-reducer.js @@ -94,11 +94,7 @@ incrementalStateSyncActionType, } from '../types/socket-types.js'; import { threadPermissions } from '../types/thread-permission-types.js'; -import type { - LegacyRawThreadInfos, - RawThreadInfo, - RawThreadInfos, -} from '../types/thread-types.js'; +import type { RawThreadInfo, RawThreadInfos } from '../types/thread-types.js'; import { type ClientUpdateInfo, processUpdatesActionType, @@ -309,7 +305,7 @@ oldMessageStore: MessageStore, newMessageInfos: $ReadOnlyArray, truncationStatus: { +[threadID: string]: MessageTruncationStatus }, - threadInfos: LegacyRawThreadInfos, + threadInfos: RawThreadInfos, ): MergeNewMessagesResult { const { messageStoreOperations: updateWithLatestThreadInfosOps, @@ -633,7 +629,7 @@ }; function updateMessageStoreWithLatestThreadInfos( messageStore: MessageStore, - threadInfos: LegacyRawThreadInfos, + threadInfos: RawThreadInfos, ): UpdateMessageStoreWithLatestThreadInfosResult { const messageStoreOperations: MessageStoreOperation[] = []; const { @@ -721,7 +717,7 @@ function reduceMessageStore( messageStore: MessageStore, action: BaseAction, - newThreadInfos: LegacyRawThreadInfos, + newThreadInfos: RawThreadInfos, ): ReduceMessageStoreResult { if ( action.type === logInActionTypes.success ||