From 1861131ce296d70c6818bd5f4ab56dc1be0bb5dc Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 2 Oct 2023 14:27:32 +1100
Subject: [PATCH] refactor: replaced get lastDisappearingMessageChangeTimestamp
 calls

with getLastDisappearingMessageChangeTimestamp
---
 ts/models/conversation.ts   | 6 +++---
 ts/util/expiringMessages.ts | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index d1a1421e1..02892d012 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -331,7 +331,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.expirationMode = this.getExpirationMode();
     }
 
-    if (this.get('lastDisappearingMessageChangeTimestamp')) {
+    if (this.getLastDisappearingMessageChangeTimestamp()) {
       toRet.lastDisappearingMessageChangeTimestamp = this.get(
         'lastDisappearingMessageChangeTimestamp'
       );
@@ -835,9 +835,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     if (
-      this.get('lastDisappearingMessageChangeTimestamp') &&
+      this.getLastDisappearingMessageChangeTimestamp() &&
       lastDisappearingMessageChangeTimestamp &&
-      this.get('lastDisappearingMessageChangeTimestamp') >= lastDisappearingMessageChangeTimestamp
+      this.getLastDisappearingMessageChangeTimestamp() >= lastDisappearingMessageChangeTimestamp
     ) {
       window.log.info(
         'WIP: updateExpireTimer() This is an outdated disappearing message setting',
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index b07780a55..be1284891 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -449,19 +449,19 @@ export async function checkForExpireUpdateInContentMessage(
 
   // NOTE if we are checking an outgoing content message then the conversation's lastDisappearingMessageChangeTimestamp has just been set to match the content message so it can't be outdated if equal
   if (
-    convoToUpdate.get('lastDisappearingMessageChangeTimestamp') &&
+    convoToUpdate.getLastDisappearingMessageChangeTimestamp() &&
     lastDisappearingMessageChangeTimestamp &&
     ((isOutgoing &&
-      convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >
+      convoToUpdate.getLastDisappearingMessageChangeTimestamp() >
         lastDisappearingMessageChangeTimestamp) ||
       (!isOutgoing &&
-        convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >=
+        convoToUpdate.getLastDisappearingMessageChangeTimestamp() >=
           lastDisappearingMessageChangeTimestamp))
   ) {
     window.log.info(
       `WIP: checkForExpireUpdateInContentMessage() This is an outdated ${
         isOutgoing ? 'outgoing' : 'incoming'
-      } disappearing message setting. So we will ignore it.\nconvoToUpdate.get('lastDisappearingMessageChangeTimestamp'): ${convoToUpdate.get(
+      } disappearing message setting. So we will ignore it.\nconvoToUpdate.getLastDisappearingMessageChangeTimestamp(): ${convoToUpdate.get(
         'lastDisappearingMessageChangeTimestamp'
       )}\nlastDisappearingMessageChangeTimestamp: ${lastDisappearingMessageChangeTimestamp}\n\ncontent: ${JSON.stringify(
         content