Reintroduce 'expired' event, simplify handling of View Once media

ts/services/expiringMessagesDeletion.ts

@@ -52,6 +52,10 @@ class ExpiringMessagesDeletionService {
         });
 
         const conversation = message.getConversation();
+
+        // We do this to update the UI, if this message is being displayed somewhere
+        message.trigger('expired');
+
         if (conversation) {
           // An expired message only counts as decrementing the message count, not
           // the sent message count

ts/services/tapToViewMessagesDeletionService.ts

@@ -21,6 +21,9 @@ async function eraseTapToViewMessages() {
           message.idForLogging()
         );
 
+        // We do this to update the UI, if this message is being displayed somewhere
+        message.trigger('expired');
+
         await message.eraseContents();
       })
     );

ts/views/conversation_view.tsx

@@ -115,11 +115,7 @@ import {
   suspendLinkPreviews,
 } from '../services/LinkPreview';
 import { LinkPreviewSourceType } from '../types/LinkPreview';
-import {
+import { closeLightbox, showLightbox } from '../util/showLightbox';
-  closeLightbox,
-  isLightboxOpen,
-  showLightbox,
-} from '../util/showLightbox';
 
 type AttachmentOptions = {
   messageId: string;
@@ -1894,21 +1890,16 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
 
     await message.markViewOnceMessageViewed();
 
-    this.listenTo(message, 'expired', async () => {
+    const close = (): void => {
-      log.info('displayTapToViewMessage: attempting to close lightbox');
+      try {
-
+        this.stopListening(message);
-      // This isn't really a bullet-proof check because the lightbox could
+        closeLightbox();
-      // be open while we're viewing a regular media message
+      } finally {
-      if (!isLightboxOpen()) {
+        deleteTempFile(tempPath);
-        log.info('displayTapToViewMessage: lightbox was already closed');
-        return;
       }
+    };
 
-      this.stopListening(message);
+    this.listenTo(message, 'expired', close);
-      closeLightbox();
-
-      await deleteTempFile(tempPath);
-    });
     this.listenTo(message, 'change', () => {
       showLightbox(getProps());
     });
@@ -1917,9 +1908,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       const { path, contentType } = tempAttachment;
 
       return {
-        close: () => {
+        close,
-          closeLightbox();
-        },
         i18n: window.i18n,
         media: [
           {