From 31e2341978b5f43502fa0dfc65e1540edfd48dc6 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 22 Feb 2021 12:41:24 +1100
Subject: [PATCH] update last message on message delete

otherwise, we might still see the last message on the leftpane if the
message removed was the last one
---
 ts/models/conversation.ts  | 11 +++++++++--
 ts/receiver/attachments.ts |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1d6d4e323..5f9d30908 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -622,12 +622,15 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       embeddedContact && embeddedContact.length > 0
         ? getName(embeddedContact[0])
         : '';
-
+    const quotedAttachments = await this.getQuoteAttachment(
+      attachments,
+      preview
+    );
     return {
       author: contact.id,
       id: quotedMessage.get('sent_at'),
       text: body || embeddedContactName,
-      attachments: await this.getQuoteAttachment(attachments, preview),
+      attachments: quotedAttachments,
     };
   }
 
@@ -1446,11 +1449,15 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       })
     );
 
+    await this.updateLastMessage();
+
     return toDeleteLocally;
   }
 
   public async removeMessage(messageId: any) {
     await dataRemoveMessage(messageId);
+    this.updateLastMessage();
+
     window.Whisper.events.trigger('messageDeleted', {
       conversationKey: this.id,
       messageId,
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index 91e5e1818..43c821dc3 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -225,7 +225,10 @@ export async function queueAttachmentDownloads(
 ): Promise<void> {
   let count = 0;
 
-  count += await processNormalAttachments(message, message.get('attachments'));
+  count += await processNormalAttachments(
+    message,
+    message.get('attachments') || []
+  );
 
   count += await processPreviews(message);