Page MenuHomePhabricator
Files F3347375

D9655.diff
No OneTemporary
Actions

D9655.diff
View Options

diff --git a/keyserver/src/creators/update-creator.js b/keyserver/src/creators/update-creator.js
--- a/keyserver/src/creators/update-creator.js
+++ b/keyserver/src/creators/update-creator.js
@@ -25,7 +25,7 @@
redisMessageTypes,
type NewUpdatesRedisMessage,
} from 'lib/types/redis-types.js';
-import type { RawThreadInfo } from 'lib/types/thread-types.js';
+import type { RawThreadInfo, RawThreadInfos } from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types-enum.js';
import {
type ServerUpdateInfo,
@@ -45,10 +45,7 @@
fetchEntryInfosByID,
} from '../fetchers/entry-fetchers.js';
import { fetchMessageInfos } from '../fetchers/message-fetchers.js';
-import {
- fetchThreadInfos,
- type FetchThreadInfosResult,
-} from '../fetchers/thread-fetchers.js';
+import { fetchThreadInfos } from '../fetchers/thread-fetchers.js';
import {
fetchKnownUserInfos,
fetchCurrentUserInfo,
@@ -471,18 +468,15 @@
currentUserInfoResult,
} = await promiseAll(promises);
- let threadInfosResult;
+ let threadInfos = {};
if (viewerInfo.threadInfos) {
- const { threadInfos } = viewerInfo;
- threadInfosResult = { threadInfos };
+ threadInfos = viewerInfo.threadInfos;
} else if (threadResult) {
- threadInfosResult = threadResult;
- } else {
- threadInfosResult = { threadInfos: {} };
+ threadInfos = threadResult.threadInfos;
}
return await updateInfosFromRawUpdateInfos(viewer, rawUpdateInfos, {
- threadInfosResult,
+ threadInfos,
messageInfosResult,
calendarResult,
entryInfosResult,
@@ -491,7 +485,7 @@
}
export type UpdateInfosRawData = {
- threadInfosResult: FetchThreadInfosResult,
+ threadInfos: RawThreadInfos,
messageInfosResult: ?FetchMessageInfosResult,
calendarResult: ?FetchEntryInfosBase,
entryInfosResult: ?RawEntryInfos,
@@ -503,7 +497,7 @@
rawData: UpdateInfosRawData,
): Promise<FetchUpdatesResult> {
const {
- threadInfosResult,
+ threadInfos,
messageInfosResult,
calendarResult,
entryInfosResult,
@@ -537,7 +531,7 @@
deletedUserID: rawUpdateInfo.deletedUserID,
});
} else if (rawUpdateInfo.type === updateTypes.UPDATE_THREAD) {
- const threadInfo = threadInfosResult.threadInfos[rawUpdateInfo.threadID];
+ const threadInfo = threadInfos[rawUpdateInfo.threadID];
if (!threadInfo) {
console.warn(
"failed to hydrate updateTypes.UPDATE_THREAD because we couldn't " +
@@ -567,7 +561,7 @@
threadID: rawUpdateInfo.threadID,
});
} else if (rawUpdateInfo.type === updateTypes.JOIN_THREAD) {
- const threadInfo = threadInfosResult.threadInfos[rawUpdateInfo.threadID];
+ const threadInfo = threadInfos[rawUpdateInfo.threadID];
if (!threadInfo) {
console.warn(
"failed to hydrate updateTypes.JOIN_THREAD because we couldn't " +
diff --git a/keyserver/src/fetchers/thread-fetchers.js b/keyserver/src/fetchers/thread-fetchers.js
--- a/keyserver/src/fetchers/thread-fetchers.js
+++ b/keyserver/src/fetchers/thread-fetchers.js
@@ -223,7 +223,7 @@
return { threadInfos };
}
-export type FetchThreadInfosResult = {
+type FetchThreadInfosResult = {
+threadInfos: RawThreadInfos,
};

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 12:01 PM (15 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2570506
Default Alt Text
D9655.diff (3 KB)

Event Timeline