From 38a8012e1004ac9e0f01d886b407f01da2fe5227 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 28 Sep 2023 16:56:54 +1000
Subject: [PATCH] refactor: providedexpirationtype to provideddisappearingmode

---
 ts/interactions/conversationInteractions.ts | 4 ++--
 ts/models/conversation.ts                   | 6 +++---
 ts/receiver/closedGroups.ts                 | 2 +-
 ts/receiver/configMessage.ts                | 4 ++--
 ts/receiver/queuedJob.ts                    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index bfc10c896..122bf88b1 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -383,13 +383,13 @@ export async function setDisappearingMessagesByConvoId(
 
   if (!expirationMode || expirationMode === 'off' || !seconds || seconds <= 0) {
     await conversation.updateExpireTimer({
-      providedExpirationType: 'off',
+      providedDisappearingMode: 'off',
       providedExpireTimer: 0,
       providedChangeTimestamp,
     });
   } else {
     await conversation.updateExpireTimer({
-      providedExpirationType: expirationMode,
+      providedDisappearingMode: expirationMode,
       providedExpireTimer: seconds,
       providedChangeTimestamp,
     });
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 3acf63dc8..3f38f5277 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -802,7 +802,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
   // tslint:disable: cyclomatic-complexity
   public async updateExpireTimer({
-    providedExpirationType,
+    providedDisappearingMode,
     providedExpireTimer,
     providedChangeTimestamp,
     providedSource,
@@ -811,7 +811,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     shouldCommit = true,
     existingMessage,
   }: {
-    providedExpirationType?: DisappearingMessageConversationModeType;
+    providedDisappearingMode?: DisappearingMessageConversationModeType;
     providedExpireTimer?: number;
     providedChangeTimestamp: number;
     providedSource?: string;
@@ -824,7 +824,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       window.log.warn("updateExpireTimer() Disappearing messages aren't supported in communities");
       return;
     }
-    let expirationMode = providedExpirationType;
+    let expirationMode = providedDisappearingMode;
     let expireTimer = providedExpireTimer;
     const lastDisappearingMessageChangeTimestamp = providedChangeTimestamp;
     const source = providedSource || UserUtils.getOurPubKeyStrFromCache();
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index a2e3c507c..9ac7bb6f6 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -318,7 +318,7 @@ export async function handleNewClosedGroup(
 
       // TODO This is only applicable for old closed groups - will be removed in future
       await groupConvo.updateExpireTimer({
-        providedExpirationType: expireTimer === 0 ? 'off' : 'deleteAfterSend',
+        providedDisappearingMode: expireTimer === 0 ? 'off' : 'deleteAfterSend',
         providedExpireTimer: expireTimer,
         providedChangeTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
         providedSource: sender,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 8b6b07e41..7f118b783 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -231,7 +231,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
 
     if (wrapperNoteToSelfExpirySeconds !== expireTimer) {
       await ourConvo.updateExpireTimer({
-        providedExpirationType:
+        providedDisappearingMode:
           wrapperNoteToSelfExpirySeconds && wrapperNoteToSelfExpirySeconds > 0
             ? 'deleteAfterSend'
             : 'off',
@@ -387,7 +387,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         wrapperConvo.expirationMode !== contactConvo.get('expirationMode')
       ) {
         await contactConvo.updateExpireTimer({
-          providedExpirationType: wrapperConvo.expirationMode,
+          providedDisappearingMode: wrapperConvo.expirationMode,
           providedExpireTimer: wrapperConvo.expirationTimerSeconds,
           providedChangeTimestamp: result.latestEnvelopeTimestamp,
           providedSource: wrapperConvo.id,
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index b573ef73e..5331b3bed 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -455,7 +455,7 @@ export async function handleMessageJob(
       }
 
       await conversation.updateExpireTimer({
-        providedExpirationType: expirationTypeUpdate,
+        providedDisappearingMode: expirationTypeUpdate,
         providedExpireTimer: expireTimerUpdate,
         providedChangeTimestamp: lastDisappearingMessageChangeTimestamp,
         providedSource: source,