Page MenuHomePhabricator
Files F3276048

D10917.diff
No OneTemporary
Actions

D10917.diff
View Options

diff --git a/web/database/utils/store.js b/web/database/utils/store.js
--- a/web/database/utils/store.js
+++ b/web/database/utils/store.js
@@ -11,7 +11,7 @@
import { workerRequestMessageTypes } from '../../types/worker-types.js';
import { getDatabaseModule } from '../database-module-provider.js';
-async function getClientStore(): Promise<ClientStore> {
+async function getClientDBStore(): Promise<ClientStore> {
const databaseModule = await getDatabaseModule();
let result: ClientStore = {
currentUserID: null,
@@ -99,4 +99,4 @@
}
}
-export { getClientStore, processDBStoreOperations };
+export { getClientDBStore, processDBStoreOperations };
diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js
--- a/web/database/worker/db-worker.js
+++ b/web/database/worker/db-worker.js
@@ -3,7 +3,7 @@
import localforage from 'localforage';
import {
- getClientStore,
+ getClientStoreFromQueryExecutor,
processDBStoreOperations,
} from './process-operations.js';
import {
@@ -178,7 +178,7 @@
if (message.type === workerRequestMessageTypes.GET_CLIENT_STORE) {
return {
type: workerResponseMessageTypes.CLIENT_STORE,
- store: getClientStore(sqliteQueryExecutor),
+ store: getClientStoreFromQueryExecutor(sqliteQueryExecutor),
};
} else if (message.type === workerRequestMessageTypes.GET_CURRENT_USER_ID) {
return {
diff --git a/web/database/worker/process-operations.js b/web/database/worker/process-operations.js
--- a/web/database/worker/process-operations.js
+++ b/web/database/worker/process-operations.js
@@ -161,7 +161,7 @@
}
}
-function getClientStore(
+function getClientStoreFromQueryExecutor(
sqliteQueryExecutor: SQLiteQueryExecutor,
): ClientDBStore {
return {
@@ -177,4 +177,4 @@
};
}
-export { processDBStoreOperations, getClientStore };
+export { processDBStoreOperations, getClientStoreFromQueryExecutor };
diff --git a/web/redux/initial-state-gate.js b/web/redux/initial-state-gate.js
--- a/web/redux/initial-state-gate.js
+++ b/web/redux/initial-state-gate.js
@@ -22,7 +22,7 @@
} from './action-types.js';
import { useSelector } from './redux-utils.js';
import {
- getClientStore,
+ getClientDBStore,
processDBStoreOperations,
} from '../database/utils/store.js';
import Loading from '../loading.react.js';
@@ -62,7 +62,7 @@
thread: convertIDToNewSchema(urlInfo.thread, ashoatKeyserverID),
};
}
- const clientDBStore = await getClientStore();
+ const clientDBStore = await getClientDBStore();
dispatch({
type: setClientDBStoreActionType,
payload: clientDBStore,

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 7:19 AM (21 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2517842
Default Alt Text
D10917.diff (2 KB)

Event Timeline