From 7cbc35c57ba8ed275c5bc11f9d381f58cd60d6ad Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 6 Feb 2023 18:21:41 -0800
Subject: [PATCH] Group story replies: On send, don't set expire timer

---
 ts/models/conversations.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 8ab3590f04..2369ee69ff 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4019,14 +4019,8 @@ export class ConversationModel extends window.Backbone
     let expirationStartTimestamp: number | undefined;
     let expireTimer: DurationInSeconds | undefined;
 
-    // If it's a group story reply then let's match the expiration timers
-    // with the parent story's expiration.
-    if (storyId && isGroup(this.attributes)) {
-      const parentStory = await getMessageById(storyId);
-      expirationStartTimestamp =
-        parentStory?.expirationStartTimestamp || Date.now();
-      expireTimer = parentStory?.expireTimer || DurationInSeconds.DAY;
-    } else {
+    // For normal messages and 1:1 story replies, we use the parent conversation's timer
+    if (!storyId || isDirectConversation(this.attributes)) {
       await this.maybeApplyUniversalTimer();
       expireTimer = this.get('expireTimer');
     }