Remove messageCollection from Conversation model

js/delivery_receipts.js

@@ -107,8 +107,11 @@
         const conversation = ConversationController.get(
           message.get('conversationId')
         );
-        if (conversation) {
-          conversation.trigger('delivered', message);
+        const updateLeftPane = conversation
+          ? conversation.debouncedUpdateLastMessage
+          : undefined;
+        if (updateLeftPane) {
+          updateLeftPane();
         }
 
         this.remove(receipt);

js/expiring_messages.js

@@ -41,7 +41,9 @@
 
         const conversation = message.getConversation();
         if (conversation) {
-          conversation.trigger('expired', message);
+          // An expired message only counts as decrementing the message count, not
+          // the sent message count
+          conversation.decrementMessageCount();
         }
       });
     } catch (error) {

js/expiring_tap_to_view_messages.js

@@ -29,7 +29,6 @@
             message.idForLogging()
           );
 
-          message.trigger('erased');
           await message.eraseContents();
         })
       );

js/message_controller.js

@@ -1,104 +0,0 @@
-// Copyright 2019-2020 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-// eslint-disable-next-line func-names
-(function () {
-  window.Whisper = window.Whisper || {};
-
-  const messageLookup = Object.create(null);
-  const msgIDsBySender = new Map();
-  const msgIDsBySentAt = new Map();
-
-  const SECOND = 1000;
-  const MINUTE = SECOND * 60;
-  const FIVE_MINUTES = MINUTE * 5;
-  const HOUR = MINUTE * 60;
-
-  function register(id, message) {
-    if (!id || !message) {
-      return message;
-    }
-
-    const existing = messageLookup[id];
-    if (existing) {
-      messageLookup[id] = {
-        message: existing.message,
-        timestamp: Date.now(),
-      };
-      return existing.message;
-    }
-
-    messageLookup[id] = {
-      message,
-      timestamp: Date.now(),
-    };
-
-    msgIDsBySentAt.set(message.get('sent_at'), id);
-    msgIDsBySender.set(message.getSenderIdentifier(), id);
-
-    return message;
-  }
-
-  function unregister(id) {
-    const { message } = messageLookup[id] || {};
-    if (message) {
-      msgIDsBySender.delete(message.getSenderIdentifier());
-      msgIDsBySentAt.delete(message.get('sent_at'));
-    }
-    delete messageLookup[id];
-  }
-
-  function cleanup() {
-    const messages = Object.values(messageLookup);
-    const now = Date.now();
-
-    for (let i = 0, max = messages.length; i < max; i += 1) {
-      const { message, timestamp } = messages[i];
-      const conversation = message.getConversation();
-
-      if (
-        now - timestamp > FIVE_MINUTES &&
-        (!conversation || !conversation.messageCollection.length)
-      ) {
-        unregister(message.id);
-      }
-    }
-  }
-
-  function getById(id) {
-    const existing = messageLookup[id];
-    return existing && existing.message ? existing.message : undefined;
-  }
-
-  function findBySentAt(sentAt) {
-    const id = msgIDsBySentAt.get(sentAt);
-    if (!id) {
-      return null;
-    }
-    return getById(id);
-  }
-
-  function findBySender(sender) {
-    const id = msgIDsBySender.get(sender);
-    if (!id) {
-      return null;
-    }
-    return getById(id);
-  }
-
-  function _get() {
-    return messageLookup;
-  }
-
-  setInterval(cleanup, HOUR);
-
-  window.MessageController = {
-    register,
-    unregister,
-    cleanup,
-    findBySender,
-    findBySentAt,
-    getById,
-    _get,
-  };
-})();

js/modules/attachment_downloads.js

@@ -281,14 +281,6 @@ async function _finishJob(message, id) {
     await saveMessage(message.attributes, {
       Message: Whisper.Message,
     });
-    const conversation = message.getConversation();
-    if (conversation) {
-      const fromConversation = conversation.messageCollection.get(message.id);
-
-      if (fromConversation && message !== fromConversation) {
-        fromConversation.set(message.attributes);
-      }
-    }
   }
 
   await removeAttachmentDownloadJob(id);

js/read_receipts.js

@@ -108,8 +108,11 @@
         const conversation = ConversationController.get(
           message.get('conversationId')
         );
-        if (conversation) {
-          conversation.trigger('read', message);
+        const updateLeftPane = conversation
+          ? conversation.debouncedUpdateLastMessage
+          : undefined;
+        if (updateLeftPane) {
+          updateLeftPane();
         }
 
         this.remove(receipt);