Page MenuHomePhabricator
Differential D6933

[keyserver] Drill MessageDatas into sendPushNotifs
ClosedPublic
Actions

Authored by ashoat on Mar 2 2023, 2:03 PM.
Tags
None
Referenced Files
F5492545: D6933.diff
Fri, Apr 11, 5:17 AM
Unknown Object (File)
Sun, Apr 6, 11:01 AM
Unknown Object (File)
Thu, Apr 3, 7:28 AM
Unknown Object (File)
Wed, Apr 2, 3:10 PM
Unknown Object (File)
Wed, Apr 2, 3:10 PM
Unknown Object (File)
Wed, Apr 2, 3:10 PM
Unknown Object (File)
Tue, Apr 1, 1:52 PM
Unknown Object (File)
Mon, Mar 17, 4:47 AM
View All Files
Subscribers
tomek

Details

Reviewers
atul
Commits
rCOMM7e9c849bb41e: [keyserver] Drill MessageDatas into sendPushNotifs
Summary

In the next diff, we'll pass the MessageDatas into notificationCollapseKey on the message specs.

Depends on D6932

Test Plan

Flow, and tested in combination with the next diffs to confirm that getting @-tagged in a message that triggers the creation of a sidebar will update the SIDEBAR_CREATION notif to be suffixed with "and tagged you"

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
17 lines
push/
3 lines

Diff 23414

View Options

keyserver/src/creators/message-creator.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

keyserver/src/push/send.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