From 5e9f3d517108f51b8434ef68be8e797330a5d477 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 19 Sep 2022 13:40:03 -0700
Subject: [PATCH] Unarchive conversation if another device sent a message to it

---
 ts/models/messages.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index d9e4f6cae..ea00de93c 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -2763,6 +2763,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
 
         window.MessageController.register(message.id, message);
         conversation.incrementMessageCount();
+
+        // If we sent a message in a given conversation, unarchive it!
+        if (type === 'outgoing') {
+          conversation.setArchived(false);
+        }
+
         window.Signal.Data.updateConversation(conversation.attributes);
 
         const reduxState = window.reduxStore.getState();
@@ -3017,9 +3023,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
         !isGroupStoryReply &&
         !keepThisConversationArchived
       ) {
-        conversation.set({
-          isArchived: false,
-        });
+        conversation.setArchived(false);
       }
 
       if (!isFirstRun && this.pendingMarkRead) {