Page MenuHomePhorge
Files F32560981

D7140.1767308411.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D7140.1767308411.diff
View Options

diff --git a/lib/selectors/chat-selectors.js b/lib/selectors/chat-selectors.js
--- a/lib/selectors/chat-selectors.js
+++ b/lib/selectors/chat-selectors.js
@@ -585,6 +585,31 @@
userInfoInputArray,
threadInfo,
}: UseMessageListDataArgs): MessageListData {
+ const messageInfos = useSelector(messageInfoSelector);
+
+ const containingThread = useSelector(state => {
+ if (!threadInfo || threadInfo.type !== threadTypes.SIDEBAR) {
+ return null;
+ }
+ return state.messageStore.threads[threadInfo.containingThreadID];
+ });
+
+ const editedText = React.useMemo(() => {
+ const sourceMessageID = threadInfo?.sourceMessageID;
+ const threadMessageInfos = (containingThread?.messageIDs ?? [])
+ .map((messageID: string) => messageInfos[messageID])
+ .filter(Boolean)
+ .filter(
+ message =>
+ message.type === messageTypes.EDIT_MESSAGE &&
+ message.targetMessageID === sourceMessageID,
+ );
+ if (threadMessageInfos.length === 0) {
+ return null;
+ }
+ return threadMessageInfos[0].text;
+ }, [containingThread?.messageIDs, messageInfos, threadInfo?.sourceMessageID]);
+
const pendingSidebarSourceMessageInfo = useSelector(state => {
const sourceMessageID = threadInfo?.sourceMessageID;
if (
@@ -595,14 +620,24 @@
return null;
}
const thread = state.messageStore.threads[threadInfo.id];
- const messageInfos = messageInfoSelector(state);
const shouldSourceBeAdded =
!thread ||
(thread.startReached &&
thread.messageIDs.every(
id => messageInfos[id]?.type !== messageTypes.SIDEBAR_SOURCE,
));
- return shouldSourceBeAdded ? messageInfos[sourceMessageID] : null;
+
+ if (!shouldSourceBeAdded) {
+ return null;
+ }
+ let result = messageInfos[sourceMessageID];
+ if (result && result.type === messageTypes.TEXT && editedText) {
+ result = {
+ ...result,
+ text: editedText,
+ };
+ }
+ return result;
});
invariant(

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 11:00 PM (1 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5877736
Default Alt Text
D7140.1767308411.diff (1 KB)

Event Timeline