From 7c6e6c981aa99865270217cce2c327b165434e3f Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Tue, 19 Sep 2023 14:50:48 +1000
Subject: [PATCH] fix: make sure to note sent another message

in all remote cases
---
 ts/models/conversation.ts   |  7 +++----
 ts/receiver/queuedJob.ts    |  2 ++
 ts/util/expiringMessages.ts | 11 ++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 6a1f8c6e3..711db8b33 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -830,7 +830,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     let expirationType = providedExpirationType;
     let expireTimer = providedExpireTimer;
     const lastDisappearingMessageChangeTimestamp = providedChangeTimestamp;
-    let source = providedSource;
+    const source = providedSource || UserUtils.getOurPubKeyStrFromCache();
 
     if (expirationType === undefined || expireTimer === undefined) {
       expirationType = 'off';
@@ -866,7 +866,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     const isOutgoing = Boolean(!receivedAt);
-    source = source || UserUtils.getOurPubKeyStrFromCache();
 
     // When we add a disappearing messages notification to the conversation, we want it
     // to be above the message that initiated that change, hence the subtraction.
@@ -940,9 +939,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     // if change was made remotely, don't send it to the contact/group
-    if (fromSync || fromConfigMessage) {
+    if (receivedAt || fromSync || fromConfigMessage) {
       window.log.debug(
-        `WIP: updateExpireTimer() Not sending an ExpireTimerUpdate message because change was made remotely receivedAt:${receivedAt} fromSync:${fromSync} fromConfigMessage:${fromConfigMessage} `
+        `WIP: updateExpireTimer() We dont send an ExpireTimerUpdate because this was a remote change receivedAt:${receivedAt} fromSync:${fromSync} fromConfigMessage:${fromConfigMessage} `
       );
       return;
     }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index e338f0fa4..48e41ee14 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -438,6 +438,7 @@ export async function handleMessageJob(
             messageModel
           )}\n\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
         );
+        confirm?.();
         return;
       }
 
@@ -456,6 +457,7 @@ export async function handleMessageJob(
             messageModel
           )}\n\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
         );
+        confirm?.();
         return;
       }
 
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 0839ee926..1f1322a27 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -442,11 +442,12 @@ export async function checkForExpireUpdateInContentMessage(
     convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >=
       lastDisappearingMessageChangeTimestamp
   ) {
-    window.log.info(
-      `WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting. So we will ignore it.\ncontent: ${JSON.stringify(
-        content
-      )}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}`
-    );
+    // window.log.info(
+    //   `WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting. So we will ignore it.\ncontent: ${JSON.stringify(
+    //     content
+    //   )}
+    // );
+
     return {
       expirationType: changeToDisappearingMessageType(
         convoToUpdate,