Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Group story replies: On send, don't set expire timer

Browse Source
This commit is contained in:
Scott Nonnenberg
2023-02-06 18:21:41 -08:00
committed by GitHub
parent 9ce4d32afb
commit 7cbc35c57b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/models/conversations.ts
View File

@@ -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');
}