Do not add non-messages to the timeline

ts/models/conversations.ts

@@ -90,10 +90,11 @@ import {
 } from '../util/whatTypeOfConversation';
 import { SignalService as Proto } from '../protobuf';
 import {
+  getMessagePropStatus,
   hasErrors,
   isIncoming,
+  isStory,
   isTapToView,
-  getMessagePropStatus,
 } from '../state/selectors/message';
 import {
   conversationJobQueue,
@@ -1373,7 +1374,9 @@ export class ConversationModel extends window.Backbone
     // Clear typing indicator for a given contact if we receive a message from them
     this.clearContactTypingTimer(typingToken);
 
+    if (!isStory(message.attributes)) {
       this.addSingleMessage(message);
+    }
 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     this.debouncedUpdateLastMessage!();

ts/models/messages.ts

@@ -227,14 +227,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   notifyRedux(): void {
-    const { messageChanged } = window.reduxActions.conversations;
-
-    if (messageChanged) {
-      const conversationId = this.get('conversationId');
-      // Note: The clone is important for triggering a re-run of selectors
-      messageChanged(this.id, conversationId, { ...this.attributes });
-    }
-
     const { storyChanged } = window.reduxActions.stories;
 
     if (isStory(this.attributes)) {
@@ -250,6 +242,17 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       }
 
       storyChanged(storyData);
+
+      // We don't want messageChanged to run
+      return;
+    }
+
+    const { messageChanged } = window.reduxActions.conversations;
+
+    if (messageChanged) {
+      const conversationId = this.get('conversationId');
+      // Note: The clone is important for triggering a re-run of selectors
+      messageChanged(this.id, conversationId, { ...this.attributes });
     }
   }