From 3d8a664da9400aebcc271d971b64331fcda4ffb5 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Tue, 19 Sep 2023 13:42:05 +1000
Subject: [PATCH] fix: ignore equal lastMessageChangeTimestamps

---
 ts/models/conversation.ts   | 2 +-
 ts/receiver/queuedJob.ts    | 4 ++--
 ts/util/expiringMessages.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 54bdc747a..6a1f8c6e3 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -840,7 +840,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (
       this.get('lastDisappearingMessageChangeTimestamp') &&
       lastDisappearingMessageChangeTimestamp &&
-      this.get('lastDisappearingMessageChangeTimestamp') > lastDisappearingMessageChangeTimestamp
+      this.get('lastDisappearingMessageChangeTimestamp') >= lastDisappearingMessageChangeTimestamp
     ) {
       window.log.info(
         'WIP: updateExpireTimer() This is an outdated disappearing message setting',
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 3d3c25b22..7bab0d570 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -436,7 +436,7 @@ export async function handleMessageJob(
         window.log.debug(
           `WIP: There is a problem with the expiration timer update.\nmessage model: ${JSON.stringify(
             messageModel
-          )}\nexpirationTimerUpdte: ${JSON.stringify(expirationTimerUpdate)}`
+          )}\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
         );
         return;
       }
@@ -454,7 +454,7 @@ export async function handleMessageJob(
         window.log.debug(
           `WIP: There is a problem with the expiration timer update. The lastDisappearingMessageChangeTimestamp is missing.\nmessage model: ${JSON.stringify(
             messageModel
-          )}\nexpirationTimerUpdte: ${JSON.stringify(expirationTimerUpdate)}`
+          )}\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
         );
         return;
       }
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 928fc0bcc..d950dc620 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -427,11 +427,11 @@ export async function checkForExpireUpdateInContentMessage(
   if (
     convoToUpdate.get('lastDisappearingMessageChangeTimestamp') &&
     lastDisappearingMessageChangeTimestamp &&
-    convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >
+    convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >=
       lastDisappearingMessageChangeTimestamp
   ) {
     window.log.info(
-      `WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting.\ncontent: ${JSON.stringify(
+      `WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting. So we will ignore it.\ncontent: ${JSON.stringify(
         content
       )}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}`
     );