From d794b0a0d46da4c149182be1bf2f5717fa01f616 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Wed, 9 Aug 2023 17:26:40 +1000
Subject: [PATCH] fix: comment out user config disappearing messages stuff for
 now

---
 .../OverlayDisappearingMessages.tsx           | 12 ++---
 ts/node/migration/sessionMigrations.ts        | 19 ++++----
 ts/receiver/configMessage.ts                  | 46 +++++++++----------
 .../libsession/libsession_utils_contacts.ts   |  5 +-
 .../libsession_utils_user_groups.ts           |  2 +-
 .../libsession_utils_user_profile.ts          | 13 ++++--
 ts/types/sqlSharedTypes.ts                    |  2 +-
 .../browser/libsession_worker_interface.ts    |  6 +--
 8 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
index 75454aecc..3a0b6ecca 100644
--- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
+++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
@@ -110,12 +110,12 @@ export const OverlayDisappearingMessages = ({ unlockNewModes }: { unlockNewModes
         dispatch(closeRightPanel());
         dispatch(resetRightOverlayMode());
       }
-    } else {
-      if (selectedConversationKey && modeSelected) {
-        await setDisappearingMessagesByConvoId(selectedConversationKey, modeSelected, timeSelected);
-        dispatch(closeRightPanel());
-        dispatch(resetRightOverlayMode());
-      }
+      return;
+    }
+    if (selectedConversationKey && modeSelected) {
+      await setDisappearingMessagesByConvoId(selectedConversationKey, modeSelected, timeSelected);
+      dispatch(closeRightPanel());
+      dispatch(resetRightOverlayMode());
     }
   };
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 1c1148c1a..fb4b70131 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1224,7 +1224,7 @@ function insertContactIntoContactWrapper(
     const dbApprovedMe = !!contact.didApproveMe || false;
     const dbBlocked = blockedNumbers.includes(contact.id);
     const priority = contact.priority || CONVERSATION_PRIORITIES.default;
-    const expirationTimerSeconds = contact.expireTimer || 0;
+    // const expirationTimerSeconds = contact.expireTimer || 0;
 
     const wrapperContact = getContactInfoFromDBValues({
       id: contact.id,
@@ -1237,7 +1237,7 @@ function insertContactIntoContactWrapper(
       dbProfileUrl: contact.avatarPointer || undefined,
       priority,
       dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
-      expirationTimerSeconds, // FIXME WILL add expirationMode here
+      // expirationTimerSeconds, // FIXME WILL add expirationMode here
     });
 
     try {
@@ -1262,7 +1262,7 @@ function insertContactIntoContactWrapper(
             dbProfileUrl: undefined,
             priority: CONVERSATION_PRIORITIES.default,
             dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
-            expirationTimerSeconds: 0, // FIXME WILL add expirationMode here
+            // expirationTimerSeconds: 0, // FIXME WILL add expirationMode here
           })
         );
       } catch (err2) {
@@ -1385,7 +1385,7 @@ function insertLegacyGroupIntoWrapper(
   const {
     priority,
     id,
-    expireTimer,
+    // expireTimer,
     groupAdmins,
     members,
     displayNameInProfile,
@@ -1400,7 +1400,7 @@ function insertLegacyGroupIntoWrapper(
   const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
     id,
     priority,
-    expireTimer, // FIXME WILL add expirationMode here
+    // expireTimer, // FIXME WILL add expirationMode here
     groupAdmins,
     members,
     displayNameInProfile,
@@ -1628,7 +1628,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
       const ourConvoPriority = ourConversation.priority;
-      const ourConvoExpire = ourConversation.expireTimer || 0;
+      // const ourConvoExpire = ourConversation.expireTimer || 0;
+
       if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
         userProfileWrapper.setUserInfo(
           ourDbName,
@@ -1636,8 +1637,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
           {
             url: ourDbProfileUrl,
             key: ourDbProfileKey,
-          },
-          ourConvoExpire
+          }
+          // , ourConvoExpire
         );
       }
 
@@ -1861,6 +1862,8 @@ function updateToSessionSchemaVersion33(currentVersion: number, db: BetterSqlite
     return;
   }
 
+  // TODO we actually want to update the config wrappers that relate to disappearing messages with the type and seconds
+
   console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
   db.transaction(() => {
     // Conversation changes
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index c0c4becf6..ffe5710dc 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -331,17 +331,17 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
       // FIXME Will unsure
-      if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
-        await contactConvo.updateExpireTimer({
-          providedExpireTimer: wrapperConvo.expirationTimerSeconds,
-          fromSync: true,
-          providedExpirationType: wrapperConvo.expirationMode,
-          shouldCommit: false,
-          providedChangeTimestamp: result.latestEnvelopeTimestamp,
-          fromConfigMessage: true,
-        });
-        changes = true;
-      }
+      // if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
+      //   await contactConvo.updateExpireTimer({
+      //     providedExpireTimer: wrapperConvo.expirationTimerSeconds,
+      //     fromSync: true,
+      //     providedExpirationType: wrapperConvo.expirationMode,
+      //     shouldCommit: false,
+      //     providedChangeTimestamp: result.latestEnvelopeTimestamp,
+      //     fromConfigMessage: true,
+      //   });
+      //   changes = true;
+      // }
 
       // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
       if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
@@ -567,18 +567,18 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     }
 
     // FIXME Will unsure
-    if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
-      await legacyGroupConvo.updateExpireTimer({
-        providedExpireTimer: fromWrapper.disappearingTimerSeconds,
-        shouldCommit: false,
-        fromSync: true,
-        providedChangeTimestamp: latestEnvelopeTimestamp,
-        fromConfigMessage: true,
-        providedExpirationType:
-          fromWrapper.disappearingTimerSeconds === 0 ? 'off' : 'deleteAfterSend',
-      });
-      changes = true;
-    }
+    // if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
+    //   await legacyGroupConvo.updateExpireTimer({
+    //     providedExpireTimer: fromWrapper.disappearingTimerSeconds,
+    //     shouldCommit: false,
+    //     fromSync: true,
+    //     providedChangeTimestamp: latestEnvelopeTimestamp,
+    //     fromConfigMessage: true,
+    //     providedExpirationType:
+    //       fromWrapper.disappearingTimerSeconds === 0 ? 'off' : 'deleteAfterSend',
+    //   });
+    //   changes = true;
+    // }
 
     // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead
     if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) {
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 5cfe6e7ae..fe5629d84 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -36,7 +36,6 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean {
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that contact does not exist in the wrapper, it is created before being updated.
  */
-
 async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
   const foundConvo = getConversationController().get(id);
   if (!foundConvo) {
@@ -55,7 +54,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
   const dbBlocked = !!foundConvo.isBlocked() || false;
   const priority = foundConvo.get('priority') || 0;
-  const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
+  // const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
 
   const wrapperContact = getContactInfoFromDBValues({
     id,
@@ -68,7 +67,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     dbProfileUrl,
     priority,
     dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet.
-    expirationTimerSeconds, //FIXME WILL add expirationMode here
+    // expirationTimerSeconds, // FIXME WILL add expirationMode here
   });
   try {
     window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 778f72d35..d1b9629f1 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -116,7 +116,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         priority: foundConvo.get('priority'),
         members: foundConvo.get('members') || [],
         groupAdmins: foundConvo.get('groupAdmins') || [],
-        expireTimer: foundConvo.get('expireTimer'), // FIXME WILL add expirationMode here
+        // expireTimer: foundConvo.get('expireTimer'), // FIXME WILL add expirationMode here
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 8faafc275..bfdfad348 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -26,7 +26,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
       { url: dbProfileUrl, key: dbProfileKey }
     )} `
   );
-  const expirySeconds = ourConvo.get('expireTimer') || 0;
+  // const expirySeconds = ourConvo.get('expireTimer') || 0;
   if (dbProfileUrl && !isEmpty(dbProfileKey)) {
     await UserConfigWrapperActions.setUserInfo(
       dbName,
@@ -34,11 +34,16 @@ async function insertUserProfileIntoWrapper(convoId: string) {
       {
         url: dbProfileUrl,
         key: dbProfileKey,
-      },
-      expirySeconds
+      }
+      // expirySeconds
     );
   } else {
-    await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds);
+    await UserConfigWrapperActions.setUserInfo(
+      dbName,
+      priority,
+      null
+      // , expirySeconds
+    );
   }
 }
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 94a960c0e..2834bf790 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -131,7 +131,7 @@ export function getContactInfoFromDBValues({
   dbCreatedAtSeconds: number;
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
-  expirationTimerSeconds: number | undefined;
+  // expirationTimerSeconds: number | undefined;
 }): ContactInfoSet {
   const wrapperContact: ContactInfoSet = {
     id,
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 16ae8127a..419aba445 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -106,8 +106,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   setUserInfo: async (
     name: string,
     priority: number,
-    profilePic: { url: string; key: Uint8Array } | null,
-    expireSeconds: number
+    profilePic: { url: string; key: Uint8Array } | null
+    // expireSeconds: number
   ) =>
     callLibSessionWorker([
       'UserConfig',
@@ -115,7 +115,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
       name,
       priority,
       profilePic,
-      expireSeconds,
+      // expireSeconds,
     ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
 };