Set draftChanged=true when changing draftAttachments, better logging

signalapp · Jan 13, 2023 · cd6e4bb · cd6e4bb
1 parent 9374832
commit cd6e4bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ts/state/ducks/composer.ts b/ts/state/ducks/composer.ts
@@ -679,6 +679,7 @@ function addAttachment(
     const conversation = window.ConversationController.get(conversationId);
     if (conversation) {
       conversation.attributes.draftAttachments = nextAttachments;
+      conversation.attributes.draftChanged = true;
       window.Signal.Data.updateConversation(conversation.attributes);
     }
   };
@@ -716,6 +717,7 @@ function addPendingAttachment(
     const conversation = window.ConversationController.get(conversationId);
     if (conversation) {
       conversation.attributes.draftAttachments = nextAttachments;
+      conversation.attributes.draftChanged = true;
       window.Signal.Data.updateConversation(conversation.attributes);
     }
   };

diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
@@ -3619,15 +3619,12 @@ function onConversationClosed(
       throw new Error('onConversationClosed: Conversation not found');
     }
 
-    log.info(
-      'unloading conversation',
-      conversation.idForLogging(),
-      'due to:',
-      reason
-    );
+    const logId = `onConversationClosed/${conversation.idForLogging()}`;
+    log.info(`${logId}: unloading due to ${reason}`);
 
     if (conversation.get('draftChanged')) {
       if (conversation.hasDraft()) {
+        log.info(`${logId}: new draft info needs update`);
         const now = Date.now();
         const activeAt = conversation.get('active_at') || now;
 
@@ -3638,6 +3635,7 @@ function onConversationClosed(
           timestamp: now,
         });
       } else {
+        log.info(`${logId}: clearing draft info`);
         conversation.set({
           draftChanged: false,
           draftTimestamp: null,