Page MenuHomePhabricator
Differential D7700

[lib] Update `reduceCurrentUserInfo` to handle `CurrentUserUpdate` payload instead of `ClientAvatar`
ClosedPublic
Actions

Authored by atul on May 1 2023, 1:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:28 AM
Unknown Object (File)
Mar 2 2025, 12:19 AM
Unknown Object (File)
Feb 27 2025, 7:01 PM
View All Files
Subscribers
inka
tomek

Details

Reviewers
ashoat
ginsu
Commits
rCOMM66c2d2dc3c51: [lib] Update `reduceCurrentUserInfo` to handle `CurrentUserUpdate` payload…
Summary

Depends on D7699

Update reduceCurrentUserInfo on client to update currentUserInfo.avatar based off of update payload instead of ClientAvatar.

Test Plan

Continues to work as expected:

(Need to bump codeversion to 215 for this to work, will make sure I land this diff and codeversion change simultaneously so master is never in a broken state)

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.May 1 2023, 1:16 PM
Herald added a subscriber: tomek. · View Herald TranscriptMay 1 2023, 1:17 PM
atul edited the summary of this revision. (Show Details)May 1 2023, 1:17 PM
atul added a parent revision: D7699: [keyserver] Update `updateUserAvatarResponder` to return `CreateUpdatesResult` for new clients.
atul edited the test plan for this revision. (Show Details)May 1 2023, 1:20 PM
atul published this revision for review.May 1 2023, 1:23 PM
atul added a child revision: D7701: [lib] Update `reduceUserInfos` to handle `updateUserAvatarActionTypes.success`.May 1 2023, 1:29 PM
Harbormaster completed remote builds in B18963: Diff 25975.May 1 2023, 1:36 PM
ashoat accepted this revision.May 1 2023, 2:00 PM
ashoat added inline comments.
lib/actions/user-actions.js
261 ↗(On Diff #25975)

Let's explicitly return a property of the object rather than the whole thing

lib/types/redux-types.js
939 ↗(On Diff #25975)

Maybe a new type that contains this

This revision is now accepted and ready to land.May 1 2023, 2:00 PM
atul added inline comments.May 1 2023, 2:15 PM
lib/types/redux-types.js
939 ↗(On Diff #25975)

If we're going to return result.updates (CreateUpdatesResult) in `updateUserAvatar(...), shouldn't we leave this matching?

ashoat added inline comments.May 1 2023, 2:35 PM
lib/types/redux-types.js
939 ↗(On Diff #25975)

I think we want to have different types for the keyserver return on the keyserver side vs the payload on the client... the keyserver return will have an optional avatarInfo in there, but the client payload should just be an object that contains a single property, which is updates: CreateUpdatesResult. So basically:

export type UpdateUserAvatarResponse = {
  +avatarInfo?: ClientAvatarInfo,
  +updates?: CreateUpdatesResult,
};
export type UpdateUserAvatarResult = {
  +updates: CreateUpdatesResult,
};

With UpdateUserAvatarResult being both the return of the action function in lib/actions, as wella as the payload used here.

atul added inline comments.May 1 2023, 2:48 PM
lib/types/redux-types.js
939 ↗(On Diff #25975)

I don't think we need avatarInfo in UpdateUserAvatarResponse? I'm not sure I'm following

On keyserver:

  • For old clients we need to return ?ClientAvatar directly. We can't retroactively wrap it in a UpdateUserAvatarResponse?
  • For new clients we want to return CreateUpdatesResult wrapped in UpdateUserAvatarResponse. There's no need for avatarInfo because it's included in the updates?

I think we need to return ?ClientAvatar | UpdateUserAvatarResult(as UpdateUserAvatarResult is defined above) on the keyserver and type action function return type and payload in redux-types as UpdateUserAvatarResult? I'm not sure we need to do the following:

Let's explicitly return a property of the object rather than the whole thing

in updateUserAvatar?

atul updated this revision to Diff 25983.May 1 2023, 2:58 PM

address feedback (i think)

atul requested review of this revision.May 1 2023, 3:00 PM
atul added inline comments.
lib/actions/user-actions.js
264–268 ↗(On Diff #25983)

If I understood correctly, we want to pull out the fields that exist today (just updates), so that any "new" fields of UpdateUserAvatarResponse don't get included in payload passed to reducers for old clients?

I'm not sure if I understood correctly, so this could be a nonsensical change.

Harbormaster failed remote builds in B18968: Diff 25983!May 1 2023, 3:14 PM
ashoat accepted this revision.May 1 2023, 3:31 PM
ashoat added a subscriber: inka.

Please address inline feedback and fix CI before landing. Would be great if all of these new types were in avatar-types.js

keyserver/src/responders/user-responders.js
632 ↗(On Diff #25983)

Looks like account-updaters.js was importing this export from here

lib/actions/user-actions.js
254–256 ↗(On Diff #25983)
  1. Can we put this in lib/types/avatar-types.js?
  2. The previous diff introduces a corresponding type for this on the keyserver side, which differs. In that diff I suggested using this name for that type. Thinking about this more, in cases like this we usually have ServerUpdateUserAvatarResponse and ClientUpdateUserAvatarResponse...
264–268 ↗(On Diff #25983)

Yeah exactly! Similar to what @tomek did in response to @inka's feedback here

This revision is now accepted and ready to land.May 1 2023, 3:31 PM
atul updated this revision to Diff 25993.May 2 2023, 8:08 AM

rebase BEFORE addressing feedback

atul updated this revision to Diff 25994.May 2 2023, 8:18 AM

move UpdateUserAvatarResponse alongside UpdateUserAvatarRequest in avatar-types

Harbormaster failed remote builds in B18976: Diff 25993!May 2 2023, 8:22 AM
Harbormaster completed remote builds in B18977: Diff 25994.May 2 2023, 8:36 AM
atul updated this revision to Diff 26009.May 2 2023, 8:51 AM

make sure it's right

Harbormaster completed remote builds in B18992: Diff 26009.May 2 2023, 9:08 AM
Closed by commit rCOMM66c2d2dc3c51: [lib] Update `reduceCurrentUserInfo` to handle `CurrentUserUpdate` payload… (authored by atul). · Explain WhyMay 2 2023, 9:53 AM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM66c2d2dc3c51: [lib] Update `reduceCurrentUserInfo` to handle `CurrentUserUpdate` payload….

Revision Contents
Changeset List

PathSize
lib/
actions/
12 lines
reducers/
17 lines
types/
7 lines

Diff 26012

View Options

lib/actions/user-actions.js

// @flow // @flow
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant'; import invariant from 'invariant';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist'; import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js'; import type { Transform } from 'redux-persist/es/types.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js'; import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js'; import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import { import {
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js'; import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js'; import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { import {
type LocalMessageInfo, type LocalMessageInfo,
type MessageStore, type MessageStore,
messageTypes, messageTypes,
type ClientDBMessageStoreOperation, type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js'; import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js'; import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js'; import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js'; import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js'; import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js'; import { isTaskCancelledError } from '../utils/error-handling.js';
const migrations = { const migrations = {
[1]: (state: AppState) => ({ [1]: (state: AppState) => ({
...state, ...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines try {
console.log(exception); console.log(exception);
if (isTaskCancelledError(exception)) { if (isTaskCancelledError(exception)) {
return state; return state;
} }
return { ...state, cookie: null }; return { ...state, cookie: null };
} }
return state; return state;
}, },
[32]: (state: AppState) => { [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table. [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[34]: state => { [34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state; const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs; return stateSansThreadIDsToNotifIDs;
}, },
}; };
// After migration 31, we'll no longer want to persist `messageStore.messages` // After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in // via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines
View Options

lib/reducers/user-reducer.js

// @flow // @flow
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant'; import invariant from 'invariant';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist'; import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js'; import type { Transform } from 'redux-persist/es/types.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js'; import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js'; import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import { import {
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js'; import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js'; import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { import {
type LocalMessageInfo, type LocalMessageInfo,
type MessageStore, type MessageStore,
messageTypes, messageTypes,
type ClientDBMessageStoreOperation, type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js'; import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js'; import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js'; import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js'; import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js'; import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js'; import { isTaskCancelledError } from '../utils/error-handling.js';
const migrations = { const migrations = {
[1]: (state: AppState) => ({ [1]: (state: AppState) => ({
...state, ...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines try {
console.log(exception); console.log(exception);
if (isTaskCancelledError(exception)) { if (isTaskCancelledError(exception)) {
return state; return state;
} }
return { ...state, cookie: null }; return { ...state, cookie: null };
} }
return state; return state;
}, },
[32]: (state: AppState) => { [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table. [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[34]: state => { [34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state; const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs; return stateSansThreadIDsToNotifIDs;
}, },
}; };
// After migration 31, we'll no longer want to persist `messageStore.messages` // After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in // via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines
View Options

lib/types/redux-types.js

// @flow // @flow
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant'; import invariant from 'invariant';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist'; import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js'; import type { Transform } from 'redux-persist/es/types.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js'; import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js'; import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import { import {
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js'; import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js'; import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { import {
type LocalMessageInfo, type LocalMessageInfo,
type MessageStore, type MessageStore,
messageTypes, messageTypes,
type ClientDBMessageStoreOperation, type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js'; import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js'; import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js'; import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js'; import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js'; import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js'; import { isTaskCancelledError } from '../utils/error-handling.js';
const migrations = { const migrations = {
[1]: (state: AppState) => ({ [1]: (state: AppState) => ({
...state, ...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines try {
console.log(exception); console.log(exception);
if (isTaskCancelledError(exception)) { if (isTaskCancelledError(exception)) {
return state; return state;
} }
return { ...state, cookie: null }; return { ...state, cookie: null };
} }
return state; return state;
}, },
[32]: (state: AppState) => { [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table. [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[34]: state => { [34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state; const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs; return stateSansThreadIDsToNotifIDs;
}, },
}; };
// After migration 31, we'll no longer want to persist `messageStore.messages` // After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in // via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines