Store all story reactions as messages

ts/components/StoryViewsNRepliesModal.tsx

@@ -111,7 +111,7 @@ export type PropsType = {
   preferredReactionEmoji: Array<string>;
   recentEmojis?: Array<string>;
   renderEmojiPicker: (props: RenderEmojiPickerProps) => JSX.Element;
-  replies: Array<ReplyType>;
+  replies: ReadonlyArray<ReplyType>;
   skinTone?: number;
   sortedGroupMembers?: Array<ConversationType>;
   storyPreviewAttachment?: AttachmentType;

ts/jobs/helpers/sendNormalMessage.ts

@@ -4,19 +4,22 @@
 import { isNumber } from 'lodash';
 
 import * as Errors from '../../types/errors';
+import { strictAssert } from '../../util/assert';
 import type { MessageModel } from '../../models/messages';
 import { getMessageById } from '../../messages/getMessageById';
 import type { ConversationModel } from '../../models/conversations';
 import { isGroup, isGroupV2, isMe } from '../../util/whatTypeOfConversation';
 import { getSendOptions } from '../../util/getSendOptions';
 import { SignalService as Proto } from '../../protobuf';
 import { handleMessageSend } from '../../util/handleMessageSend';
+import { findAndFormatContact } from '../../util/findAndFormatContact';
 import type { CallbackResultType } from '../../textsecure/Types.d';
 import { isSent } from '../../messages/MessageSendState';
-import { isOutgoing } from '../../state/selectors/message';
+import { isOutgoing, canReact } from '../../state/selectors/message';
 import type {
   AttachmentType,
   ContactWithHydratedAvatar,
+  ReactionType,
 } from '../../textsecure/SendMessage';
 import type { LinkPreviewType } from '../../types/message/LinkPreviews';
 import type { BodyRangesType, StoryContextType } from '../../types/Util';
@@ -149,9 +152,37 @@ export async function sendNormalMessage(
       preview,
       quote,
       sticker,
+      storyMessage,
       storyContext,
+      reaction,
     } = await getMessageSendData({ log, message });
 
+    if (reaction) {
+      strictAssert(
+        storyMessage,
+        'Only story reactions can be sent as normal messages'
+      );
+
+      const ourConversationId =
+        window.ConversationController.getOurConversationIdOrThrow();
+
+      if (
+        !canReact(
+          storyMessage.attributes,
+          ourConversationId,
+          findAndFormatContact
+        )
+      ) {
+        log.info(
+          `could not react to ${messageId}. Removing this pending reaction`
+        );
+        await markMessageFailed(message, [
+          new Error('Could not react to story'),
+        ]);
+        return;
+      }
+    }
+
     let messageSendPromise: Promise<CallbackResultType | void>;
 
     if (recipientIdentifiersWithoutMe.length === 0) {
@@ -185,6 +216,7 @@ export async function sendNormalMessage(
         sticker,
         // No storyContext; you can't reply to your own stories
         timestamp: messageTimestamp,
+        reaction,
       });
       messageSendPromise = message.sendSyncMessageOnly(dataMessage, saveErrors);
     } else {
@@ -228,6 +260,7 @@ export async function sendNormalMessage(
                 quote,
                 sticker,
                 storyContext,
+                reaction,
                 timestamp: messageTimestamp,
                 mentions,
               },
@@ -280,9 +313,9 @@ export async function sendNormalMessage(
           preview,
           profileKey,
           quote,
-          reaction: undefined,
           sticker,
           storyContext,
+          reaction,
           timestamp: messageTimestamp,
           // Note: 1:1 story replies should not set story=true -   they aren't group sends
           urgent: true,
@@ -436,6 +469,8 @@ async function getMessageSendData({
   preview: Array<LinkPreviewType>;
   quote: QuotedMessageType | null;
   sticker: StickerWithHydratedData | undefined;
+  reaction: ReactionType | undefined;
+  storyMessage?: MessageModel;
   storyContext?: StoryContextType;
 }> {
   const {
@@ -488,6 +523,8 @@ async function getMessageSendData({
     }
   );
 
+  const storyReaction = message.get('storyReaction');
+
   return {
     attachments,
     body,
@@ -499,12 +536,19 @@ async function getMessageSendData({
     preview,
     quote,
     sticker,
+    storyMessage,
     storyContext: storyMessage
       ? {
           authorUuid: storyMessage.get('sourceUuid'),
           timestamp: storyMessage.get('sent_at'),
         }
       : undefined,
+    reaction: storyReaction
+      ? {
+          ...storyReaction,
+          remove: false,
+        }
+      : undefined,
   };
 }
 

ts/jobs/helpers/sendReaction.ts

@@ -4,6 +4,7 @@
 import { isNumber } from 'lodash';
 
 import * as Errors from '../../types/errors';
+import { strictAssert } from '../../util/assert';
 import { repeat, zipObject } from '../../util/iterables';
 import type { CallbackResultType } from '../../textsecure/Types.d';
 import type { MessageModel } from '../../models/messages';
@@ -63,11 +64,16 @@ export async function sendReaction(
     return;
   }
 
+  strictAssert(
+    !isStory(message.attributes),
+    'Story reactions should be handled by sendStoryReaction'
+  );
   const { pendingReaction, emojiToRemove } =
     reactionUtil.getNewestPendingOutgoingReaction(
       getReactions(message),
       ourConversationId
     );
+
   if (!pendingReaction) {
     log.info(`no pending reaction for ${messageId}. Doing nothing`);
     return;
@@ -153,17 +159,7 @@ export async function sendReaction(
       ),
     });
 
-    if (
-      isStory(message.attributes) &&
-      isDirectConversation(conversation.attributes)
-    ) {
-      ephemeralMessageForReactionSend.set({
-        storyId: message.id,
-        storyReactionEmoji: reactionForSend.emoji,
-      });
-    } else {
-      ephemeralMessageForReactionSend.doNotSave = true;
-    }
+    ephemeralMessageForReactionSend.doNotSave = true;
 
     let didFullySend: boolean;
     const successfulConversationIds = new Set<string>();
@@ -233,12 +229,6 @@ export async function sendReaction(
           groupId: undefined,
           profileKey,
           options: sendOptions,
-          storyContext: isStory(message.attributes)
-            ? {
-                authorUuid: message.get('sourceUuid'),
-                timestamp: message.get('sent_at'),
-              }
-            : undefined,
           urgent: true,
           includePniSignatureMessage: true,
         });
@@ -271,12 +261,6 @@ export async function sendReaction(
                 timestamp: pendingReaction.timestamp,
                 expireTimer,
                 profileKey,
-                storyContext: isStory(message.attributes)
-                  ? {
-                      authorUuid: message.get('sourceUuid'),
-                      timestamp: message.get('sent_at'),
-                    }
-                  : undefined,
               },
               messageId,
               sendOptions,
@@ -346,8 +330,7 @@ export async function sendReaction(
     const newReactions = reactionUtil.markOutgoingReactionSent(
       getReactions(message),
       pendingReaction,
-      successfulConversationIds,
-      message.attributes
+      successfulConversationIds
     );
     setReactions(message, newReactions);
 
@@ -372,8 +355,9 @@ export async function sendReaction(
   }
 }
 
-const getReactions = (message: MessageModel): Array<MessageReactionType> =>
-  message.get('reactions') || [];
+const getReactions = (
+  message: MessageModel
+): ReadonlyArray<MessageReactionType> => message.get('reactions') || [];
 
 const setReactions = (
   message: MessageModel,

ts/messageModifiers/Reactions.ts

@@ -169,14 +169,15 @@ export class Reactions extends Collection<ReactionModel> {
         );
 
         // Use the generated message in ts/background.ts to create a message
-        // if the reaction is targetted at a story on a 1:1 conversation.
-        if (
-          isStory(targetMessage) &&
-          isDirectConversation(targetConversation.attributes)
-        ) {
+        // if the reaction is targetted at a story.
+        if (isStory(targetMessage)) {
           generatedMessage.set({
             storyId: targetMessage.id,
-            storyReactionEmoji: reaction.get('emoji'),
+            storyReaction: {
+              emoji: reaction.get('emoji'),
+              targetAuthorUuid: reaction.get('targetAuthorUuid'),
+              targetTimestamp: reaction.get('targetTimestamp'),
+            },
           });
 
           // Note: generatedMessage comes with an id, so we have to force this save

ts/model-types.d.ts

@@ -146,7 +146,7 @@ export type MessageAttributesType = {
   messageTimer?: unknown;
   profileChange?: ProfileNameChangeType;
   quote?: QuotedMessageType;
-  reactions?: Array<MessageReactionType>;
+  reactions?: ReadonlyArray<MessageReactionType>;
   requiredProtocolVersion?: number;
   retryOptions?: RetryOptions;
   sourceDevice?: number;
@@ -184,7 +184,11 @@ export type MessageAttributesType = {
   unidentifiedDeliveries?: Array<string>;
   contact?: Array<EmbeddedContactType>;
   conversationId: string;
-  storyReactionEmoji?: string;
+  storyReaction?: {
+    emoji: string;
+    targetAuthorUuid: string;
+    targetTimestamp: number;
+  };
   giftBadge?: {
     expiration: number;
     level: number;