Page MenuHomePhabricator
Files F3383457

D11188.id39366.diff
No OneTemporary
Actions

D11188.id39366.diff
View Options

diff --git a/lib/permissions/special-roles.js b/lib/permissions/special-roles.js
--- a/lib/permissions/special-roles.js
+++ b/lib/permissions/special-roles.js
@@ -65,4 +65,8 @@
return _mapValues(patchRawThreadInfoWithSpecialRole)(rawThreadInfos);
}
-export { patchRoleInfoWithSpecialRole, patchRawThreadInfosWithSpecialRole };
+export {
+ patchRoleInfoWithSpecialRole,
+ patchRawThreadInfosWithSpecialRole,
+ patchRawThreadInfoWithSpecialRole,
+};
diff --git a/web/redux/persist.js b/web/redux/persist.js
--- a/web/redux/persist.js
+++ b/web/redux/persist.js
@@ -11,6 +11,8 @@
type ReplaceKeyserverOperation,
} from 'lib/ops/keyserver-store-ops.js';
import type { ClientDBMessageStoreOperation } from 'lib/ops/message-store-ops.js';
+import type { ClientDBThreadStoreOperation } from 'lib/ops/thread-store-ops.js';
+import { patchRawThreadInfoWithSpecialRole } from 'lib/permissions/special-roles.js';
import {
createAsyncMigrate,
type StorageMigrationFunction,
@@ -25,6 +27,7 @@
import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
+import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js';
@@ -35,6 +38,10 @@
} from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
+import {
+ convertClientDBThreadInfoToRawThreadInfo,
+ convertRawThreadInfoToClientDBThreadInfo,
+} from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js';
@@ -437,6 +444,52 @@
storeOperations: { messageStoreOperations },
});
+ return state;
+ },
+ [17]: async (state: AppState) => {
+ // 1. Check if `databaseModule` is supported and early-exit if not.
+ const sharedWorker = await getCommSharedWorker();
+ const isDatabaseSupported = await sharedWorker.isSupported();
+
+ if (!isDatabaseSupported) {
+ return state;
+ }
+
+ // 2. Get existing `stores` from SQLite.
+ const stores = await sharedWorker.schedule({
+ type: workerRequestMessageTypes.GET_CLIENT_STORE,
+ });
+
+ const threads: ?$ReadOnlyArray<ClientDBThreadInfo> = stores?.store?.threads;
+
+ if (threads === null || threads === undefined || threads.length === 0) {
+ return state;
+ }
+
+ // 3. Convert to `RawThreadInfo`, patch in `specialRole`, and convert back.
+ const patchedClientDBThreadInfos: $ReadOnlyArray<ClientDBThreadInfo> =
+ threads
+ .map(convertClientDBThreadInfoToRawThreadInfo)
+ .map(patchRawThreadInfoWithSpecialRole)
+ .map(convertRawThreadInfoToClientDBThreadInfo);
+
+ // 4. Construct operations to remove existing threads and replace them
+ // with threads that have the `specialRole` field patched in.
+ const threadStoreOperations: ClientDBThreadStoreOperation[] = [];
+ threadStoreOperations.push({ type: 'remove_all' });
+ for (const clientDBThreadInfo: ClientDBThreadInfo of patchedClientDBThreadInfos) {
+ threadStoreOperations.push({
+ type: 'replace',
+ payload: clientDBThreadInfo,
+ });
+ }
+
+ // 5. Process the constructed `threadStoreOperations`.
+ await sharedWorker.schedule({
+ type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS,
+ storeOperations: { threadStoreOperations },
+ });
+
return state;
},
};
@@ -484,7 +537,7 @@
{ debug: isDev },
migrateStorageToSQLite,
): any),
- version: 16,
+ version: 17,
transforms: [messageStoreMessagesBlocklistTransform, keyserverStoreTransform],
};

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 3:45 PM (21 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2597412
Default Alt Text
D11188.id39366.diff (3 KB)

Event Timeline