From 12a29f718adcda18ae155193c284b35f8b0eed06 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 9 Oct 2023 17:16:05 +1100
Subject: [PATCH] feat: updateExpireTimer arg shouldCommitMessage

when testing we dont want to commit the timer update message
---
 ts/models/conversation.ts    | 15 ++++++++++-----
 ts/receiver/configMessage.ts |  6 +++---
 ts/receiver/queuedJob.ts     |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index f47e1f62b..57573e0cf 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -810,7 +810,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * @param providedSource the pubkey of the user who made the change
    * @param receivedAt the timestamp of when the change was received
    * @param fromSync if the change was made from a sync message
-   * @param shouldCommit if the change should be committed to the DB
+   * @param shouldCommitConvo if the conversation change should be committed to the DB
+   * @param shouldCommitMessage if the timer update message change should be committed to the DB
    * @param existingMessage if we have an existing message model to update
    * @returns true, if the change was made or false if it was ignored
    */
@@ -821,7 +822,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     providedSource,
     receivedAt, // is set if it comes from outside
     fromSync = false, // if the update comes from a config or sync message
-    shouldCommit = true,
+    shouldCommitConvo = true,
+    shouldCommitMessage = true,
     existingMessage,
   }: {
     providedDisappearingMode?: DisappearingMessageConversationModeType;
@@ -830,7 +832,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     providedSource?: string;
     receivedAt?: number; // is set if it comes from outside
     fromSync?: boolean;
-    shouldCommit?: boolean;
+    shouldCommitConvo?: boolean;
+    shouldCommitMessage?: boolean;
     existingMessage?: MessageModel;
   }): Promise<boolean> {
     if (this.isPublic()) {
@@ -937,7 +940,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       this.set('active_at', timestamp);
     }
 
-    if (shouldCommit) {
+    if (shouldCommitConvo) {
       // tell the UI this conversation was updated
       await this.commit();
     }
@@ -960,7 +963,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
               'updateExpireTimer() remote change'
             ),
           });
-          await message.commit();
+          if (shouldCommitMessage) {
+            await message.commit();
+          }
         }
       }
       return true;
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 7f2db5a76..c075912df 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -243,7 +243,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
         providedSource: ourConvo.id,
         receivedAt: result.latestEnvelopeTimestamp,
         fromSync: true,
-        shouldCommit: false,
+        shouldCommitConvo: false,
       });
       changes = success;
       if (success) {
@@ -402,7 +402,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
           providedSource: wrapperConvo.id,
           receivedAt: result.latestEnvelopeTimestamp,
           fromSync: true,
-          shouldCommit: false,
+          shouldCommitConvo: false,
         });
         changes = success;
         if (success) {
@@ -640,7 +640,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
         providedSource: legacyGroupConvo.id,
         receivedAt: latestEnvelopeTimestamp,
         fromSync: true,
-        shouldCommit: false,
+        shouldCommitConvo: false,
       });
       changes = success;
       if (success) {
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index cf7f7e501..8e0c9b87a 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -462,7 +462,7 @@ export async function handleMessageJob(
         fromSync: source === UserUtils.getOurPubKeyStrFromCache(),
         receivedAt: messageModel.get('received_at'),
         existingMessage: messageModel,
-        shouldCommit: false,
+        shouldCommitConvo: false,
         // NOTE we don't commit yet because we want to get the message id, see below
       });
       window.log.debug(