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

with getExpirationTimerUpdate
---
 ts/models/message.ts     | 6 +++---
 ts/receiver/queuedJob.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/models/message.ts b/ts/models/message.ts
index df3cefc8e..84a04c2be 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -196,7 +196,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
   public isExpirationTimerUpdate() {
     const expirationTimerFlag = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
     const flags = this.get('flags') || 0;
-    const expirationTimerUpdate = this.get('expirationTimerUpdate');
+    const expirationTimerUpdate = this.getExpirationTimerUpdate();
 
     // eslint-disable-next-line no-bitwise
     return Boolean(flags & expirationTimerFlag) || !isEmpty(expirationTimerUpdate);
@@ -260,7 +260,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return window.i18n('mediaMessage');
     }
     if (this.isExpirationTimerUpdate()) {
-      const expireTimerUpdate = this.get('expirationTimerUpdate');
+      const expireTimerUpdate = this.getExpirationTimerUpdate();
       const expireTimer = expireTimerUpdate?.expireTimer;
       const convo = this.getConversation();
       if (!convo) {
@@ -326,7 +326,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return null;
     }
 
-    const timerUpdate = this.get('expirationTimerUpdate');
+    const timerUpdate = this.getExpirationTimerUpdate();
     const convo = this.getConversation();
 
     if (!timerUpdate || !timerUpdate.source || !convo) {
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 8274dad78..118b6647c 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -421,7 +421,7 @@ export async function handleMessageJob(
 
     if (messageModel.isExpirationTimerUpdate()) {
       // NOTE if we turn off disappearing messages from a legacy client expirationTimerUpdate can be undefined but the flags value is correctly set
-      const expirationTimerUpdate = messageModel.get('expirationTimerUpdate');
+      const expirationTimerUpdate = messageModel.getExpirationTimerUpdate();
       if (
         messageModel.get('flags') !== SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE &&
         (!expirationTimerUpdate || isEmpty(expirationTimerUpdate))