Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-21 00:48:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't include expireTimer with group story reactions

Browse Source
This commit is contained in:
Scott Nonnenberg
2023-05-10 09:14:00 -07:00
committed by GitHub
parent 1622fe21e7
commit 748c56d825
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/reactions/enqueueReactionForSend.ts
View File

@@ -43,9 +43,9 @@ export async function enqueueReactionForSend({
'enqueueReactionForSend: No conversation extracted from target message'
);
const isMessageAStory = isStory(message.attributes);
const targetConversation =
isStory(message.attributes) &&
isDirectConversation(messageConversation.attributes)
isMessageAStory && isDirectConversation(messageConversation.attributes)
? window.ConversationController.get(targetAuthorUuid)
: messageConversation;
strictAssert(
@@ -53,6 +53,10 @@ export async function enqueueReactionForSend({
'enqueueReactionForSend: Did not find a targetConversation'
);
const expireTimer =
!isMessageAStory || isDirectConversation(targetConversation.attributes)
? targetConversation.get('expireTimer')
: undefined;
const storyMessage = isStory(message.attributes)
? message.attributes
: undefined;
@@ -67,7 +71,7 @@ export async function enqueueReactionForSend({
received_at: incrementMessageCounter(),
received_at_ms: timestamp,
timestamp,
expireTimer: targetConversation.get('expireTimer'),
expireTimer,
sendStateByConversationId: zipObject(
targetConversation.getMemberConversationIds(),
repeat({