Do not set conversation expire timer on incoming story msgs

2022-03-09 21:20:01 -05:00 · 2022-03-09 21:20:01 -05:00 · d0898cb0c2
commit d0898cb0c2
parent 5c5a7b3b36
2 changed files with 5 additions and 2 deletions
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@ -1811,7 +1811,10 @@ export default class MessageReceiver
      return;
    }

-    const expireTimer = envelope.timestamp + durations.DAY - Date.now();
+    const expireTimer = Math.min(
+      (envelope.serverTimestamp + durations.DAY - Date.now()) / 1000,
+      durations.DAY / 1000
+    );

    if (expireTimer <= 0) {
      log.info(