Page MenuHomePhabricator
Files F4933965

D7584.id25651.diff
No OneTemporary
Actions

D7584.id25651.diff
View Options

diff --git a/keyserver/src/fetchers/message-fetchers.js b/keyserver/src/fetchers/message-fetchers.js
--- a/keyserver/src/fetchers/message-fetchers.js
+++ b/keyserver/src/fetchers/message-fetchers.js
@@ -885,6 +885,37 @@
return SQLResult.map(item => item.rawMessageInfo);
}
+async function rawMessageInfoForRowsAndRelatedMessages(
+ rows: $ReadOnlyArray<Object>,
+ viewer?: Viewer,
+): Promise<$ReadOnlyArray<RawMessageInfo>> {
+ const parsedResults = await parseMessageSQLResult(rows, new Map(), viewer);
+ const rawMessageInfoMap = new Map<
+ string,
+ RawComposableMessageInfo | RawRobotextMessageInfo,
+ >();
+ for (const message of parsedResults) {
+ const { rawMessageInfo } = message;
+ if (
+ rawMessageInfo.type === messageTypes.SIDEBAR_SOURCE ||
+ rawMessageInfo.type === messageTypes.REACTION ||
+ rawMessageInfo.type === messageTypes.EDIT_MESSAGE
+ ) {
+ continue;
+ }
+ invariant(rawMessageInfo.id, 'rawMessageInfo.id should not be null');
+ rawMessageInfoMap.set(rawMessageInfo.id, rawMessageInfo);
+ }
+
+ const rawMessageInfos = parsedResults.map(item => item.rawMessageInfo);
+ const rawRelatedMessageInfos = await fetchRelatedMessages(
+ viewer,
+ rawMessageInfoMap,
+ );
+
+ return [...rawMessageInfos, ...rawRelatedMessageInfos];
+}
+
export {
fetchCollapsableNotifs,
fetchMessageInfos,
@@ -897,4 +928,5 @@
fetchLatestEditMessageContentByID,
fetchPinnedMessageInfos,
fetchRelatedMessages,
+ rawMessageInfoForRowsAndRelatedMessages,
};

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 18, 5:38 PM (16 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3359018
Default Alt Text
D7584.id25651.diff (1 KB)

Event Timeline