runfix(core): Fix qualified ids setting on message entities (#11960)

Author: Thomas Belin

src/script/conversation/EventBuilder.ts

@@ -18,6 +18,7 @@
  */
 
 import type {LegalHoldStatus} from '@wireapp/protocol-messaging';
+import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/';
 import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/';
 import type {QualifiedId} from '@wireapp/api-client/src/user/';
 import type {REASON as AVS_REASON} from '@wireapp/avs';
@@ -99,8 +100,13 @@ export type GroupCreationEvent = ConversationEvent<GroupCreationEventData> & {ty
 export type LegalHoldMessageEvent = ConversationEvent<{legal_hold_status: LegalHoldStatus}> & {
   type: CONVERSATION.LEGAL_HOLD_UPDATE;
 };
-export type MemberJoinEvent = BackendEventMessage<{user_ids: string[]}>;
-export type MemberLeaveEvent = BackendEventMessage<{user_ids: string[]}>;
+export type MemberJoinEvent = BackendEventMessage<{qualified_user_ids?: QualifiedId[]; user_ids: string[]}>;
+export type MemberLeaveEvent = BackendEventMessage<{
+  name?: string;
+  qualified_user_ids?: QualifiedId[];
+  reason?: MemberLeaveReason;
+  user_ids: string[];
+}>;
 export type MessageAddEvent = Omit<ConversationEvent<{}>, 'id'> & {
   edited_time?: string;
   status: StatusType;
@@ -412,6 +418,7 @@ export const EventBuilder = {
     return {
       conversation: conversationEntity.id,
       data: {
+        qualified_user_ids: [userId],
         user_ids: [userId.id],
       },
       from: removedBySelfUser ? conversationEntity.selfUser().id : userId.id,

src/script/conversation/EventMapper.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/';
+import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/src/event/';
 import {LinkPreview, ITweet, Mention} from '@wireapp/protocol-messaging';
 
 import {getLogger, Logger} from 'Util/Logger';
@@ -64,6 +64,7 @@ import type {Text as TextAsset} from '../entity/message/Text';
 import type {LinkPreviewMetaDataType} from '../links/LinkPreviewMetaDataType';
 import {LinkPreview as LinkPreviewEntity} from '../entity/message/LinkPreview';
 import {CallingTimeoutMessage} from '../entity/message/CallingTimeoutMessage';
+import {MemberJoinEvent, MemberLeaveEvent, TeamMemberLeaveEvent} from './EventBuilder';
 
 // Event Mapper to convert all server side JSON events into core entities.
 export class EventMapper {
@@ -192,17 +193,17 @@ export class EventMapper {
    * @param conversationEntity Conversation entity the event belong to
    * @returns Mapped message entity
    */
-  async _mapJsonEvent(event: EventRecord, conversationEntity: Conversation) {
+  async _mapJsonEvent(event: ConversationEvent | EventRecord, conversationEntity: Conversation) {
     let messageEntity;
 
     switch (event.type) {
       case CONVERSATION_EVENT.MEMBER_JOIN: {
-        messageEntity = this._mapEventMemberJoin(event, conversationEntity);
+        messageEntity = this._mapEventMemberJoin(event as MemberJoinEvent, conversationEntity);
         break;
       }
 
       case CONVERSATION_EVENT.MEMBER_LEAVE: {
-        messageEntity = this._mapEventMemberLeave(event);
+        messageEntity = this._mapEventMemberLeave(event as MemberLeaveEvent);
         break;
       }
 
@@ -285,7 +286,7 @@ export class EventMapper {
       }
 
       case ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE: {
-        messageEntity = this._mapEventTeamMemberLeave(event);
+        messageEntity = this._mapEventTeamMemberLeave(event as TeamMemberLeaveEvent);
         break;
       }
 
@@ -310,20 +311,33 @@ export class EventMapper {
       }
 
       default: {
-        this.logger.warn(`Ignored unhandled '${event.type}' event ${event.id ? `'${event.id}' ` : ''}`, event);
+        const {type, id} = event as EventRecord;
+        this.logger.warn(`Ignored unhandled '${type}' event ${id ? `'${id}' ` : ''}`, event);
         throw new ConversationError(
           ConversationError.TYPE.MESSAGE_NOT_FOUND,
           ConversationError.MESSAGE.MESSAGE_NOT_FOUND,
         );
       }
     }
 
-    const {category, data, from, id, primary_key, time, type, version} = event;
+    const {
+      category,
+      data,
+      from,
+      id,
+      primary_key,
+      time,
+      type,
+      version,
+      from_client_id,
+      ephemeral_expires,
+      ephemeral_started,
+    } = event as EventRecord;
 
     messageEntity.category = category;
     messageEntity.conversation_id = conversationEntity.id;
     messageEntity.from = from;
-    messageEntity.fromClientId = event.from_client_id;
+    messageEntity.fromClientId = from_client_id;
     messageEntity.id = id;
     messageEntity.primary_key = primary_key;
     messageEntity.timestamp(new Date(time).getTime());
@@ -335,20 +349,21 @@ export class EventMapper {
     }
 
     if (messageEntity.isContent() || messageEntity.isPing()) {
-      messageEntity.status(event.status || StatusType.SENT);
+      messageEntity.status((event as EventRecord).status || StatusType.SENT);
     }
 
     if (messageEntity.isComposite()) {
-      messageEntity.selectedButtonId(event.selected_button_id);
-      messageEntity.waitingButtonId(event.waiting_button_id);
+      const {selected_button_id, waiting_button_id} = event as EventRecord;
+      messageEntity.selectedButtonId(selected_button_id);
+      messageEntity.waitingButtonId(waiting_button_id);
     }
     if (messageEntity.isReactable()) {
-      (messageEntity as ContentMessage).reactions(event.reactions || {});
+      (messageEntity as ContentMessage).reactions((event as EventRecord).reactions || {});
     }
 
-    if (event.ephemeral_expires) {
-      messageEntity.ephemeral_expires(event.ephemeral_expires);
-      messageEntity.ephemeral_started(Number(event.ephemeral_started) || 0);
+    if (ephemeral_expires) {
+      messageEntity.ephemeral_expires(ephemeral_expires);
+      messageEntity.ephemeral_started(Number(ephemeral_started) || 0);
     }
 
     if (isNaN(messageEntity.timestamp())) {
@@ -460,9 +475,13 @@ export class EventMapper {
    * @param conversationEntity Conversation entity the event belong to
    * @returns Member message entity
    */
-  private _mapEventMemberJoin(event: EventRecord, conversationEntity: Conversation) {
+  private _mapEventMemberJoin(
+    event: MemberJoinEvent & {data: {has_service?: boolean}},
+    conversationEntity: Conversation,
+  ) {
     const {data: eventData, from: sender} = event;
-    const {has_service: hasService, user_ids: userIds} = eventData;
+    const {has_service: hasService} = eventData;
+    const userIds = eventData.qualified_user_ids || eventData.user_ids.map(id => ({domain: null, id}));
 
     const messageEntity = new MemberMessage();
 
@@ -471,7 +490,7 @@ export class EventMapper {
 
     if (conversationEntity.isGroup()) {
       const messageFromCreator = sender === conversationEntity.creator;
-      const creatorIndex = userIds.indexOf(sender);
+      const creatorIndex = userIds.findIndex(user => user.id === sender);
       const creatorIsJoiningMember = messageFromCreator && creatorIndex !== -1;
 
       if (creatorIsJoiningMember) {
@@ -495,9 +514,10 @@ export class EventMapper {
    * @param eventData Message data
    * @returns Member message entity
    */
-  private _mapEventMemberLeave({data: eventData}: EventRecord) {
+  private _mapEventMemberLeave({data: eventData}: MemberLeaveEvent) {
     const messageEntity = new MemberMessage();
-    messageEntity.userIds(eventData.user_ids);
+    const userIds = eventData.qualified_user_ids || eventData.user_ids.map(id => ({domain: null, id}));
+    messageEntity.userIds(userIds);
     messageEntity.reason = eventData.reason;
     return messageEntity;
   }
@@ -596,7 +616,7 @@ export class EventMapper {
    * @param event Message data
    * @returns Member message entity
    */
-  private _mapEventTeamMemberLeave(event: EventRecord) {
+  private _mapEventTeamMemberLeave(event: MemberLeaveEvent) {
     const messageEntity = this._mapEventMemberLeave(event);
     const eventData = event.data;
     messageEntity.name(eventData.name || t('conversationSomeone'));