From fcadc8df077d28eefd10c0a9126e24522d220f60 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 16 Jun 2023 18:03:21 +1000 Subject: [PATCH] fix: cleanup --- ts/interactions/conversationInteractions.ts | 4 ++-- ts/session/conversations/ConversationController.ts | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 7823ec815..fd942f432 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -733,7 +733,7 @@ export async function updateConversationInteractionState({ await convo.commit(); window.log.debug( - `WIP: updateConversationInteractionState for ${conversationId} to ${type} ${status}` + `updateConversationInteractionState for ${conversationId} to ${type} ${status}` ); } } @@ -753,7 +753,7 @@ export async function clearConversationInteractionState({ convo.set('lastMessageInteractionStatus', undefined); await convo.commit(); - window.log.debug(`WIP: clearConversationInteractionState() for ${conversationId}`); + window.log.debug(`clearConversationInteractionState for ${conversationId}`); } } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 1d7a12289..12831c94d 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -188,10 +188,7 @@ export class ConversationController { return; } - window.log.debug(`WIP: delete1o1 keepMessages ${id} ${options.keepMessages}`); - if (options.justHidePrivate || isNil(options.justHidePrivate) || conversation.isMe()) { - window.log.debug(`WIP: delete1o1 justHide ${id}`); // we just set the hidden field to true // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation. window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`); @@ -201,7 +198,6 @@ export class ConversationController { // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed) await conversation.commit(); // this updates the wrappers content to reflect the hidden state } else { - window.log.debug(`WIP: delete1o1 delete ${id}`); window.log.info(`deleteContact isPrivate, reset fields and removing from wrapper: ${id}`); await conversation.setIsApproved(false, false); @@ -420,7 +416,6 @@ export class ConversationController { // Note in some cases (hiding a conversation) we don't want to delete the messages if (!keepMessages) { - window.log.debug(`WIP: ${deleteType} destroyingMessages: ${convoId}`); // those are the stuff to do for all conversation types window.log.info(`${deleteType} destroyingMessages: ${convoId}`); await deleteAllMessagesByConvoIdNoConfirmation(convoId);