refactor: providedexpirationtype to provideddisappearingmode

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,
     });

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();

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,

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,

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,