feat: Support multipart message replies [WPB-15705]

thisisamir98 · thisisamir98 · commit eeff2163dc50 · 2025-12-29T13:59:35.000+01:00
diff --git a/src/script/message/MessageHasher.ts b/src/script/message/MessageHasher.ts
@@ -61,6 +61,8 @@ const getTimestampBytes = (event: any): number[] => {
 
 const getTextBytes = (event: any): number[] => utf8ToUtf16BE(event.data.content);
 
+const getMultipartTextBytes = (event: any): number[] => utf8ToUtf16BE(event.data.text.content);
+
 /**
  * Creates a hash of the given event.
  *
@@ -74,6 +76,10 @@ const hashEvent = (event: any): Promise<ArrayBuffer> => {
       specificBytes = getTextBytes(event);
       break;
     }
+    case ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD: {
+      specificBytes = getMultipartTextBytes(event);
+      break;
+    }
     case ClientEvent.CONVERSATION.LOCATION: {
       specificBytes = getLocationBytes(event);
       break;
diff --git a/src/script/repositories/conversation/EventBuilder/EventBuilder.ts b/src/script/repositories/conversation/EventBuilder/EventBuilder.ts
@@ -163,9 +163,29 @@ export type MultipartMessageAddEvent = ConversationEvent<
   CONVERSATION.MULTIPART_MESSAGE_ADD,
   {
     attachments: MultiPartContent['attachments'];
-    text: MultiPartContent['text'] & {mentions?: string[]; previews?: string[]};
+    text: MultiPartContent['text'] & {
+      mentions?: string[];
+      previews?: string[];
+      quote?:
+        | string
+        | {
+            message_id: string;
+            user_id: string;
+            hash: Uint8Array;
+          }
+        | {error: {type: string}};
+    };
+    replacing_message_id?: string;
   }
->;
+> & {
+  /** who have received/read the event */
+  read_receipts?: ReadReceipt[];
+  /** who reacted to the event */
+  reactions?: UserReactionMap | ReactionMap;
+  edited_time?: string;
+  status: StatusType;
+  version?: number;
+};
 export type MissedEvent = BaseEvent & {id: string; type: CONVERSATION.MISSED_MESSAGES};
 export type JoinedAfterMLSMigrationFinalisationEvent = BaseEvent & {
   type: CONVERSATION.JOINED_AFTER_MLS_MIGRATION;
diff --git a/src/script/repositories/event/EventService.ts b/src/script/repositories/event/EventService.ts
@@ -203,7 +203,20 @@ export class EventService {
         .table(StorageSchemata.OBJECT_STORE.EVENTS)
         .where(['conversation', 'time'])
         .between([conversationId, quotedMessageTime], [conversationId, new Date().toISOString()], true, true)
-        .filter(event => event.data && event.data.quote && event.data.quote.message_id === quotedMessageId)
+        .filter(event => {
+          if (!event.data) {
+            return false;
+          }
+          // Check normal message quote
+          if (event.data.quote && event.data.quote.message_id === quotedMessageId) {
+            return true;
+          }
+          // Check multipart message quote
+          if (event.data.text?.quote && event.data.text.quote.message_id === quotedMessageId) {
+            return true;
+          }
+          return false;
+        })
         .toArray();
       return events;
     }
@@ -217,7 +230,20 @@ export class EventService {
           record.time <= new Date().toISOString()
         );
       })
-      .filter(event => !!event.data && !!event.data.quote && event.data.quote.message_id === quotedMessageId)
+      .filter(event => {
+        if (!event.data) {
+          return false;
+        }
+        // Check normal message quote
+        if (event.data.quote && event.data.quote.message_id === quotedMessageId) {
+          return true;
+        }
+        // Check multipart message quote
+        if (event.data.text?.quote && event.data.text.quote.message_id === quotedMessageId) {
+          return true;
+        }
+        return false;
+      })
       .sort(compareEventsByConversation);
   }
 
diff --git a/src/script/repositories/event/preprocessor/QuoteDecoderMiddleware.ts b/src/script/repositories/event/preprocessor/QuoteDecoderMiddleware.ts
@@ -19,7 +19,7 @@
 
 import {Quote} from '@wireapp/protocol-messaging';
 
-import {MessageAddEvent} from 'Repositories/conversation/EventBuilder';
+import {MessageAddEvent, MultipartMessageAddEvent} from 'Repositories/conversation/EventBuilder';
 import {StoredEvent} from 'Repositories/storage/record/EventRecord';
 import {getLogger, Logger} from 'Util/Logger';
 import {base64ToArray} from 'Util/util';
@@ -49,6 +49,12 @@ export class QuotedMessageMiddleware implements EventMiddleware {
         const originalMessageId = event.data.replacing_message_id;
         return originalMessageId ? this.handleEditEvent(event, originalMessageId) : this.handleAddEvent(event);
       }
+      case ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD: {
+        const originalMessageId = event.data.replacing_message_id;
+        return originalMessageId
+          ? this.handleMultipartEditEvent(event, originalMessageId)
+          : this.handleMultipartAddEvent(event);
+      }
     }
     return event;
   }
@@ -100,4 +106,60 @@ export class QuotedMessageMiddleware implements EventMiddleware {
     const decoratedData = {...event.data, quote: quoteData};
     return {...event, data: decoratedData};
   }
+
+  private async handleMultipartEditEvent(
+    event: MultipartMessageAddEvent,
+    originalMessageId: string,
+  ): Promise<MultipartMessageAddEvent> {
+    const originalEvent = (await this.eventService.loadEvent(event.conversation, originalMessageId)) as StoredEvent<
+      MessageAddEvent | MultipartMessageAddEvent | undefined
+    >;
+    if (!originalEvent) {
+      return event;
+    }
+
+    const originalQuote =
+      originalEvent.type === ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD
+        ? originalEvent.data.text.quote
+        : originalEvent.data.quote;
+
+    const decoratedData = {...event.data, text: {...event.data.text, quote: originalQuote} as any};
+    return {...event, data: decoratedData};
+  }
+
+  private async handleMultipartAddEvent(event: MultipartMessageAddEvent): Promise<MultipartMessageAddEvent> {
+    const rawQuote = event.data.text.quote;
+
+    if (!rawQuote || typeof rawQuote !== 'string') {
+      return event;
+    }
+
+    const encodedQuote = base64ToArray(rawQuote);
+    const quote = Quote.decode(encodedQuote);
+    this.logger.info(`Found quoted message in multipart: ${quote.quotedMessageId}`);
+
+    const messageId = quote.quotedMessageId;
+
+    const quotedMessage = await this.eventService.loadEvent(event.conversation, messageId);
+    if (!quotedMessage) {
+      this.logger.warn(`Quoted message with ID "${messageId}" not found.`);
+      const quoteData = {
+        error: {
+          type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND,
+        },
+      };
+
+      const decoratedData = {...event.data, text: {...event.data.text, quote: quoteData} as any};
+      return {...event, data: decoratedData};
+    }
+
+    const quoteData = {
+      message_id: messageId,
+      user_id: quotedMessage.from,
+      hash: quote.quotedMessageSha256,
+    };
+
+    const decoratedData = {...event.data, text: {...event.data.text, quote: quoteData} as any};
+    return {...event, data: decoratedData};
+  }
 }
diff --git a/src/script/repositories/event/preprocessor/RepliesUpdaterMiddleware.ts b/src/script/repositories/event/preprocessor/RepliesUpdaterMiddleware.ts
@@ -17,7 +17,7 @@
  *
  */
 
-import {DeleteEvent, MessageAddEvent} from 'Repositories/conversation/EventBuilder';
+import {DeleteEvent, MessageAddEvent, MultipartMessageAddEvent} from 'Repositories/conversation/EventBuilder';
 import {StoredEvent} from 'Repositories/storage/record/EventRecord';
 import {getLogger, Logger} from 'Util/Logger';
 
@@ -45,6 +45,11 @@ export class RepliesUpdaterMiddleware implements EventMiddleware {
         return originalMessageId ? this.handleEditEvent(event, originalMessageId) : event;
       }
 
+      case ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD: {
+        const originalMessageId = event.data.replacing_message_id;
+        return originalMessageId ? this.handleMultipartEditEvent(event, originalMessageId) : event;
+      }
+
       case ClientEvent.CONVERSATION.MESSAGE_DELETE: {
         return this.handleDeleteEvent(event);
       }
@@ -60,7 +65,11 @@ export class RepliesUpdaterMiddleware implements EventMiddleware {
     const {replies} = await this.findRepliesToMessage(event.conversation, originalMessageId);
     this.logger.info(`Invalidating '${replies.length}' replies to deleted message '${originalMessageId}'`);
     replies.forEach(async reply => {
-      reply.data.quote = {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}};
+      if (reply.type === ClientEvent.CONVERSATION.MESSAGE_ADD) {
+        reply.data.quote = {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}};
+      } else if (reply.type === ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD && reply.data.text) {
+        reply.data.text.quote = {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}} as any;
+      }
       await this.eventService.replaceEvent(reply);
     });
     return event;
@@ -77,9 +86,43 @@ export class RepliesUpdaterMiddleware implements EventMiddleware {
 
     this.logger.info(`Updating '${replies.length}' replies to updated message '${originalMessageId}'`);
     replies.forEach(async reply => {
-      const quote = reply.data.quote;
-      if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
-        quote.message_id = event.id as string;
+      if (reply.type === ClientEvent.CONVERSATION.MESSAGE_ADD) {
+        const quote = reply.data.quote;
+        if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
+          quote.message_id = event.id as string;
+        }
+      } else if (reply.type === ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD && reply.data.text?.quote) {
+        const quote = reply.data.text.quote;
+        if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
+          quote.message_id = event.id as string;
+        }
+      }
+      await this.eventService.replaceEvent(reply);
+    });
+    return event;
+  }
+
+  /**
+   * will update the message ID of all the replies to an edited multipart message
+   */
+  private async handleMultipartEditEvent(event: MultipartMessageAddEvent, originalMessageId: string) {
+    const {originalEvent, replies} = await this.findRepliesToMessage(event.conversation, originalMessageId, event.id);
+    if (!originalEvent) {
+      return event;
+    }
+
+    this.logger.info(`Updating '${replies.length}' replies to updated multipart message '${originalMessageId}'`);
+    replies.forEach(async reply => {
+      if (reply.type === ClientEvent.CONVERSATION.MESSAGE_ADD) {
+        const quote = reply.data.quote;
+        if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
+          quote.message_id = event.id as string;
+        }
+      } else if (reply.type === ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD && reply.data.text?.quote) {
+        const quote = reply.data.text.quote;
+        if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
+          quote.message_id = event.id as string;
+        }
       }
       await this.eventService.replaceEvent(reply);
     });
@@ -91,10 +134,17 @@ export class RepliesUpdaterMiddleware implements EventMiddleware {
     messageId: string,
     /** in case the message was edited, we need to query the DB using the old event ID */
     previousMessageId?: string,
-  ): Promise<{originalEvent?: MessageAddEvent; replies: StoredEvent<MessageAddEvent>[]}> {
+  ): Promise<{
+    originalEvent?: MessageAddEvent | MultipartMessageAddEvent;
+    replies: StoredEvent<MessageAddEvent | MultipartMessageAddEvent>[];
+  }> {
     const originalEvent = await this.eventService.loadEvent(conversationId, previousMessageId ?? messageId);
 
-    if (!originalEvent || originalEvent.type !== ClientEvent.CONVERSATION.MESSAGE_ADD) {
+    if (
+      !originalEvent ||
+      (originalEvent.type !== ClientEvent.CONVERSATION.MESSAGE_ADD &&
+        originalEvent.type !== ClientEvent.CONVERSATION.MULTIPART_MESSAGE_ADD)
+    ) {
       return {
         replies: [],
       };
