From ee5503585a244f32a93727bd2a7e5ed9b2036070 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 22 Sep 2023 16:05:38 +1000
Subject: [PATCH] fix: comment out some unnecessary logging

---
 ts/receiver/queuedJob.ts                 | 22 +++++-----------------
 ts/session/sending/MessageSentHandler.ts |  2 +-
 ts/session/utils/sync/syncUtils.ts       | 12 ++++++------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index bff3bcbab..27746526a 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -194,7 +194,7 @@ function updateReadStatus(message: MessageModel) {
       );
 
       if (expirationMode === 'legacy' || expirationMode === 'deleteAfterRead') {
-        window.log.debug(`WIP: updateReadStatus setExpirationStartTimestamp is starting`);
+        // window.log.debug(`WIP: updateReadStatus setExpirationStartTimestamp is starting`);
         message.set({
           expirationStartTimestamp: setExpirationStartTimestamp(expirationMode),
         });
@@ -384,9 +384,9 @@ async function markConvoAsReadIfOutgoingMessage(
         );
 
         if (expirationMode !== 'off') {
-          window.log.debug(
-            `WIP: markConvoAsReadIfOutgoingMessage setExpirationStartTimestamp is starting`
-          );
+          // window.log.debug(
+          //   `WIP: markConvoAsReadIfOutgoingMessage setExpirationStartTimestamp is starting`
+          // );
           message.set({
             expirationStartTimestamp: setExpirationStartTimestamp(
               expirationMode,
@@ -435,29 +435,17 @@ export async function handleMessageJob(
         messageModel.get('expireTimer')
       );
 
-      // TODO legacy messages support will be removed in a future release
-      // NOTE if the expirationMode is deleteAfterRead then legacy sync messages need to explicitly set the expirationStartTimestamp since they are alread marked as read
-      // NOTE 2: Not sure about this code needs retested
-      // const legacySyncMessageMustDisappearAfterRead =
-      //   expirationMode === 'deleteAfterRead' &&
-      //   source === UserUtils.getOurPubKeyStrFromCache() &&
-      //   messageModel.get('type') === 'outgoing';
-
       // TODO legacy messages support will be removed in a future release
       const canBeDeleteAfterSend = conversation && (conversation.isMe() || conversation.isGroup());
-      // TODO legacy support could be broken after V2 is released on a modern client on a 1-1 with disapearAfterRead
       if (
         (canBeDeleteAfterSend && expirationMode === 'legacy') ||
         expirationMode === 'deleteAfterSend'
-        // ||
-        // legacySyncMessageMustDisappearAfterRead
       ) {
-        window.log.debug(`WIP: handleMessageJob setExpirationStartTimestamp is starting`);
+        // window.log.debug(`WIP: handleMessageJob setExpirationStartTimestamp is starting`);
         messageModel.set({
           expirationStartTimestamp: setExpirationStartTimestamp(
             expirationMode,
             messageModel.get('sent_at')
-            // !legacySyncMessageMustDisappearAfterRead ? messageModel.get('sent_at') : undefined
           ),
         });
       }
diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index 87e2a83c8..ab8a16e80 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -148,7 +148,7 @@ async function handleMessageSentSuccess(
 
     // NOTE starting disappearing messages timer for all outbound messages
     if (expirationMode !== 'off') {
-      window.log.debug(`WIP: handleMessageSentSuccess setExpirationStartTimestamp is starting`);
+      // window.log.debug(`WIP: handleMessageSentSuccess setExpirationStartTimestamp is starting`);
       fetchedMessage.set({
         expirationStartTimestamp: setExpirationStartTimestamp(
           expirationMode,
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 5323a1445..76d0d2b08 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -404,9 +404,9 @@ export const buildSyncMessage = (
       syncTarget
     );
 
-    window.log.warn(
-      `WIP: buildSyncMessage:  \nexpireTimerSyncMessage: ${JSON.stringify(expireTimerSyncMessage)}`
-    );
+    // window.log.warn(
+    //   `WIP: buildSyncMessage:  \nexpireTimerSyncMessage: ${JSON.stringify(expireTimerSyncMessage)}`
+    // );
     return expireTimerSyncMessage;
   }
 
@@ -416,8 +416,8 @@ export const buildSyncMessage = (
     timestamp,
     syncTarget
   );
-  window.log.warn(
-    `WIP: buildSyncMessage:  \nvisibleSyncMessage: ${JSON.stringify(visibleSyncMessage)}`
-  );
+  // window.log.warn(
+  //   `WIP: buildSyncMessage:  \nvisibleSyncMessage: ${JSON.stringify(visibleSyncMessage)}`
+  // );
   return visibleSyncMessage;
 };