From 523843f30e593936c2be6228ef83b4ab2b6f2ee1 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 9 Oct 2020 07:43:40 -0700
Subject: [PATCH] Proper styling for View Once messages which are deleted for
 everyone

---
 ts/models/messages.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 23a10778b..af6ec307b 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -1407,6 +1407,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   isTapToView(): boolean {
+    // If a message is deleted for everyone, that overrides all other styling
+    if (this.get('deletedForEveryone')) {
+      return false;
+    }
+
     return Boolean(this.get('isViewOnce') || this.get('messageTimer'));
   }
 
@@ -1515,12 +1520,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     additionalProperties = {},
     shouldPersist = true
   ): Promise<void> {
-    if (this.get('isErased')) {
-      return;
-    }
-
     window.log.info(`Erasing data for message ${this.idForLogging()}`);
 
+    // Note: There are cases where we want to re-erase a given message. For example, when
+    //   a viewed (or outgoing) View-Once message is deleted for everyone.
+
     try {
       await this.deleteData();
     } catch (error) {