From 8452a72847de73124d719d47dc343ee2b0696454 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Tue, 15 Nov 2022 18:27:29 -0800 Subject: [PATCH] Fix story reactions in 1:1 conversations --- ts/messageModifiers/Reactions.ts | 1 + ts/models/messages.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/ts/messageModifiers/Reactions.ts b/ts/messageModifiers/Reactions.ts index b81b181f10..c45b219911 100644 --- a/ts/messageModifiers/Reactions.ts +++ b/ts/messageModifiers/Reactions.ts @@ -172,6 +172,7 @@ export class Reactions extends Collection { // if the reaction is targetted at a story. if (isStory(targetMessage)) { generatedMessage.set({ + expireTimer: targetConversation.get('expireTimer'), storyId: targetMessage.id, storyReaction: { emoji: reaction.get('emoji'), diff --git a/ts/models/messages.ts b/ts/models/messages.ts index fb558ff222..c6bf43aed7 100644 --- a/ts/models/messages.ts +++ b/ts/models/messages.ts @@ -3467,6 +3467,7 @@ export class MessageModel extends window.Backbone.Model { received_at: incrementMessageCounter(), received_at_ms: newReaction.timestamp, timestamp: newReaction.timestamp, + expireTimer: conversation.get('expireTimer'), sendStateByConversationId: zipObject( Object.keys(newReaction.isSentByConversationId || {}), repeat({