refactor: replaced get expireTimer calls

with getExpireTimer

ts/models/conversation.ts

@@ -363,8 +363,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.get('isApproved')) {
       toRet.isApproved = this.get('isApproved');
     }
-    if (this.get('expireTimer')) {
-      toRet.expireTimer = this.get('expireTimer');
+    if (this.getExpireTimer()) {
+      toRet.expireTimer = this.getExpireTimer();
     }
     // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
     if (this.isClosedGroup()) {
@@ -756,10 +756,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       sent_at: networkTimestamp,
       expirationType: changeToDisappearingMessageType(
         this,
-        this.get('expireTimer'),
+        this.getExpireTimer(),
         this.getExpirationMode()
       ),
-      expireTimer: this.get('expireTimer'),
+      expireTimer: this.getExpireTimer(),
       serverTimestamp: this.isPublic() ? networkTimestamp : undefined,
       groupInvitation,
     });
@@ -850,7 +850,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     // Compare mode and timestamp
     if (
       isEqual(expirationMode, this.getExpirationMode()) &&
-      isEqual(expireTimer, this.get('expireTimer'))
+      isEqual(expireTimer, this.getExpireTimer())
     ) {
       window.log.info(
         `WIP: conversation: updateExpireTimer()  Ignoring ExpireTimerUpdate ${
@@ -1091,7 +1091,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
      *
      * (if there is an expireTimer, we do it the slow way, handling each message separately)
      */
-    const expireTimerSet = !!this.get('expireTimer');
+    const expireTimerSet = !!this.getExpireTimer();
     const isOpenGroup = this.isOpenGroupV2();
 
     if (isOpenGroup || !expireTimerSet) {

ts/receiver/configMessage.ts

@@ -226,7 +226,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
   if (ourConvo) {
     let changes = false;
 
-    const expireTimer = ourConvo.get('expireTimer');
+    const expireTimer = ourConvo.getExpireTimer();
     const wrapperNoteToSelfExpirySeconds = await UserConfigWrapperActions.getNoteToSelfExpiry();
 
     if (wrapperNoteToSelfExpirySeconds !== expireTimer) {
@@ -383,7 +383,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       }
 
       if (
-        wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer') ||
+        wrapperConvo.expirationTimerSeconds !== contactConvo.getExpireTimer() ||
         wrapperConvo.expirationMode !== contactConvo.getExpirationMode()
       ) {
         await contactConvo.updateExpireTimer({
@@ -696,7 +696,7 @@ async function applyConvoVolatileUpdateFromWrapper(
       canBeDeleteAfterRead &&
       (foundConvo.getExpirationMode() === 'deleteAfterRead' ||
         foundConvo.getExpirationMode() === 'legacy') &&
-      foundConvo.get('expireTimer') > 0
+      foundConvo.getExpireTimer() > 0
     ) {
       const messages2Expire = await Data.getDisappearingUnreadByConversation(
         convoId,

ts/receiver/contentMessage.ts

@@ -873,7 +873,7 @@ export async function handleDataExtractionNotification(
     const referencedAttachmentTimestamp = toNumber(referencedAttachment);
 
     const expirationMode = convo.getExpirationMode();
-    const expireTimer = convo.get('expireTimer');
+    const expireTimer = convo.getExpireTimer();
     let expirationType;
     let expirationStartTimestamp;
 

ts/session/group/closed-group.ts

@@ -74,7 +74,7 @@ export async function initiateClosedGroupUpdate(
 
   const expirationType = changeToDisappearingMessageType(
     convo,
-    convo.get('expireTimer'),
+    convo.getExpireTimer(),
     convo.getExpirationMode()
   );
 
@@ -92,7 +92,7 @@ export async function initiateClosedGroupUpdate(
     zombies: convo.get('zombies')?.filter(z => members.includes(z)),
     activeAt: Date.now(),
     expirationType,
-    expireTimer: convo.get('expireTimer'),
+    expireTimer: convo.getExpireTimer(),
   };
 
   const diff = buildGroupDiff(convo, groupDetails);
@@ -174,14 +174,14 @@ export async function addUpdateMessage(
   }
 
   const expirationMode = convo.getExpirationMode();
-  const expireTimer = convo.get('expireTimer');
+  const expireTimer = convo.getExpireTimer();
   let expirationType;
   let expirationStartTimestamp;
 
   if (convo && expirationMode && expireTimer > 0) {
     expirationType =
       expirationMode !== 'off'
-        ? changeToDisappearingMessageType(convo, convo.get('expireTimer'), expirationMode)
+        ? changeToDisappearingMessageType(convo, expireTimer, expirationMode)
         : undefined;
 
     // NOTE Trigger for an incoming message
@@ -317,7 +317,7 @@ async function sendAddedMembers(
 
   const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair);
   const expirationMode = convo.getExpirationMode() || 'off';
-  const existingExpireTimer = convo.get('expireTimer') || 0;
+  const existingExpireTimer = convo.getExpireTimer() || 0;
   // Send the Added Members message to the group (only members already in the group will get it)
   const closedGroupControlMessage = new ClosedGroupAddedMembersMessage({
     timestamp: Date.now(),

ts/session/utils/calling/CallManager.ts

@@ -517,7 +517,7 @@ export async function USER_callRecipient(recipient: string) {
   weAreCallerOnCurrentCall = true;
 
   const expirationMode = calledConvo.getExpirationMode();
-  const expireTimer = calledConvo.get('expireTimer') || 0;
+  const expireTimer = calledConvo.getExpireTimer() || 0;
   let expirationType;
   let expirationStartTimestamp;
 
@@ -902,7 +902,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
   await callerConvo.unhideIfNeeded(false);
 
   const expirationMode = callerConvo.getExpirationMode();
-  const expireTimer = callerConvo.get('expireTimer') || 0;
+  const expireTimer = callerConvo.getExpireTimer() || 0;
   let expirationType;
   let expirationStartTimestamp;
 
@@ -1259,7 +1259,7 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
   }
 
   const expirationMode = incomingCallConversation.getExpirationMode();
-  const expireTimer = incomingCallConversation.get('expireTimer') || 0;
+  const expireTimer = incomingCallConversation.getExpireTimer() || 0;
   let expirationType;
   let expirationStartTimestamp;
 

ts/session/utils/libsession/libsession_utils_contacts.ts

@@ -55,7 +55,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbBlocked = !!foundConvo.isBlocked() || false;
   const priority = foundConvo.get('priority') || 0;
   const expirationMode = foundConvo.getExpirationMode() || undefined;
-  const expireTimer = foundConvo.get('expireTimer') || 0;
+  const expireTimer = foundConvo.getExpireTimer() || 0;
 
   const wrapperContact = getContactInfoFromDBValues({
     id,

ts/session/utils/libsession/libsession_utils_user_groups.ts

@@ -117,7 +117,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         members: foundConvo.get('members') || [],
         groupAdmins: foundConvo.get('groupAdmins') || [],
         expirationMode: foundConvo.getExpirationMode() || 'off',
-        expireTimer: foundConvo.get('expireTimer') || 0,
+        expireTimer: foundConvo.getExpireTimer() || 0,
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',

ts/session/utils/libsession/libsession_utils_user_profile.ts

@@ -25,7 +25,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
 
   const areBlindedMsgRequestEnabled = !!Storage.get(SettingsKey.hasBlindedMsgRequestsEnabled);
 
-  const expirySeconds = ourConvo.get('expireTimer') || 0;
+  const expirySeconds = ourConvo.getExpireTimer() || 0;
 
   window.log.debug(
     `inserting into userprofile wrapper: username:"${dbName}", priority:${priority} image:${JSON.stringify(

ts/util/expiringMessages.ts

@@ -395,7 +395,7 @@ function checkDisappearButIsntMessage(
     expirationMode === 'off' &&
     expirationTimer === 0 &&
     convo.getExpirationMode() !== 'off' &&
-    convo.get('expireTimer') !== 0
+    convo.getExpireTimer() !== 0
   );
 }
 
@@ -505,7 +505,7 @@ export async function checkForExpireUpdateInContentMessage(
   ) {
     if (
       expirationMode !== convoToUpdate.getExpirationMode() ||
-      expirationTimer !== convoToUpdate.get('expireTimer')
+      expirationTimer !== convoToUpdate.getExpireTimer()
     ) {
       window.log.debug(
         `WIP: Received a legacy disappearing message before v2 was released without values set. Using the conversation settings.\ncontent: ${JSON.stringify(
@@ -513,7 +513,7 @@ export async function checkForExpireUpdateInContentMessage(
         )}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}`
       );
 
-      expireUpdate.expirationTimer = convoToUpdate.get('expireTimer');
+      expireUpdate.expirationTimer = convoToUpdate.getExpireTimer();
       expireUpdate.expirationType = changeToDisappearingMessageType(
         convoToUpdate,
         expireUpdate.expirationTimer,
@@ -534,7 +534,7 @@ export async function checkForExpireUpdateInContentMessage(
       )}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}`
     );
 
-    expireUpdate.expirationTimer = convoToUpdate.get('expireTimer');
+    expireUpdate.expirationTimer = convoToUpdate.getExpireTimer();
     expireUpdate.expirationType = changeToDisappearingMessageType(
       convoToUpdate,
       expireUpdate.expirationTimer,