Stories: Proper notifications and handling of out-of-order messages

ts/messageModifiers/MessageReceipts.ts

@@ -6,11 +6,9 @@
 import { isEqual } from 'lodash';
 import { Collection, Model } from 'backbone';
 
-import type { ConversationModel } from '../models/conversations';
 import type { MessageModel } from '../models/messages';
 import type { MessageAttributesType } from '../model-types.d';
 import { isOutgoing, isStory } from '../state/selectors/message';
-import { isDirectConversation } from '../util/whatTypeOfConversation';
 import { getOwn } from '../util/getOwn';
 import { missingCaseError } from '../util/missingCaseError';
 import { createWaitBatcher } from '../util/waitBatcher';
@@ -24,6 +22,7 @@ import {
 import type { DeleteSentProtoRecipientOptionsType } from '../sql/Interface';
 import dataInterface from '../sql/Client';
 import * as log from '../logging/log';
+import { getSourceUuid } from '../messages/helpers';
 
 const { deleteSentProtoRecipient } = dataInterface;
 
@@ -148,24 +147,20 @@ export class MessageReceipts extends Collection<MessageReceiptModel> {
     return singleton;
   }
 
-  forMessage(
-    conversation: ConversationModel,
-    message: MessageModel
-  ): Array<MessageReceiptModel> {
-    if (!isOutgoing(message.attributes)) {
+  forMessage(message: MessageModel): Array<MessageReceiptModel> {
+    if (!isOutgoing(message.attributes) && !isStory(message.attributes)) {
       return [];
     }
-    let ids: Array<string>;
-    if (isDirectConversation(conversation.attributes)) {
-      ids = [conversation.id];
-    } else {
-      ids = conversation.getMemberIds();
+
+    const ourUuid = window.textsecure.storage.user.getCheckedUuid().toString();
+    const sourceUuid = getSourceUuid(message.attributes);
+    if (ourUuid !== sourceUuid) {
+      return [];
     }
+
     const sentAt = message.get('sent_at');
     const receipts = this.filter(
-      receipt =>
-        receipt.get('messageSentAt') === sentAt &&
-        ids.includes(receipt.get('sourceConversationId'))
+      receipt => receipt.get('messageSentAt') === sentAt
     );
     if (receipts.length) {
       log.info(`MessageReceipts: found early receipts for message ${sentAt}`);

ts/messageModifiers/Reactions.ts

@@ -15,7 +15,7 @@ import * as log from '../logging/log';
 import { getContactId, getContact } from '../messages/helpers';
 import { isDirectConversation, isMe } from '../util/whatTypeOfConversation';
 import { isOutgoing, isStory } from '../state/selectors/message';
-import { getMessageIdForLogging } from '../util/idForLogging';
+import { strictAssert } from '../util/assert';
 
 export class ReactionModel extends Model<ReactionAttributesType> {}
 
@@ -83,10 +83,7 @@ export class Reactions extends Collection<ReactionModel> {
     });
   }
 
-  async onReaction(
-    reaction: ReactionModel,
-    generatedMessage: MessageModel
-  ): Promise<void> {
+  async onReaction(reaction: ReactionModel): Promise<void> {
     try {
       // The conversation the target message was in; we have to find it in the database
       //   to to figure that out.
@@ -102,6 +99,11 @@ export class Reactions extends Collection<ReactionModel> {
         );
       }
 
+      const generatedMessage = reaction.get('storyReactionMessage');
+      strictAssert(
+        generatedMessage,
+        'Story reactions must provide storyReactionMessage'
+      );
       const fromConversation = window.ConversationController.get(
         generatedMessage.get('conversationId')
       );
@@ -115,6 +117,8 @@ export class Reactions extends Collection<ReactionModel> {
       if (!targetMessageCheck) {
         log.info(
           'No message for reaction',
+          reaction.get('timestamp'),
+          'targeting',
           reaction.get('targetAuthorUuid'),
           reaction.get('targetTimestamp')
         );
@@ -173,46 +177,14 @@ export class Reactions extends Collection<ReactionModel> {
 
         // Use the generated message in ts/background.ts to create a message
         // if the reaction is targeted at a story.
-        if (isStory(targetMessage)) {
-          generatedMessage.set({
-            expireTimer: targetConversation.get('expireTimer'),
-            storyId: targetMessage.id,
-            storyReaction: {
-              emoji: reaction.get('emoji'),
-              targetAuthorUuid: reaction.get('targetAuthorUuid'),
-              targetTimestamp: reaction.get('targetTimestamp'),
-            },
+        if (!isStory(targetMessage)) {
+          await message.handleReaction(reaction);
+        } else {
+          await generatedMessage.handleReaction(reaction, {
+            storyMessage: targetMessage,
           });
-
-          // Note: generatedMessage comes with an id, so we have to force this save
-          await Promise.all([
-            window.Signal.Data.saveMessage(generatedMessage.attributes, {
-              ourUuid: window.textsecure.storage.user
-                .getCheckedUuid()
-                .toString(),
-              forceSave: true,
-            }),
-            generatedMessage.hydrateStoryContext(message),
-          ]);
-
-          log.info('Reactions.onReaction adding reaction to story', {
-            reactionMessageId: getMessageIdForLogging(
-              generatedMessage.attributes
-            ),
-            storyId: getMessageIdForLogging(targetMessage),
-            targetTimestamp: reaction.get('targetTimestamp'),
-            timestamp: reaction.get('timestamp'),
-          });
-
-          const messageToAdd = window.MessageController.register(
-            generatedMessage.id,
-            generatedMessage
-          );
-          void targetConversation.addSingleMessage(messageToAdd);
         }
 
-        await message.handleReaction(reaction);
-
         this.remove(reaction);
       });
     } catch (error) {