refactor: Improve incoming message typings (#16010)

wireapp · Oct 16, 2023 · 5738385 · 5738385
1 parent f781bf8
commit 5738385
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 247 deletions.
diff --git a/src/script/backup/BackupRepository.ts b/src/script/backup/BackupRepository.ts
@@ -468,11 +468,12 @@ export class BackupRepository {
   }
 
   private prepareEvents(entity: EventRecord) {
-    if (entity.data) {
+    const data = entity.data as any;
+    if (data) {
       UINT8ARRAY_FIELDS.forEach(field => {
-        const dataField = entity.data[field];
+        const dataField = data[field];
         if (dataField) {
-          entity.data[field] = new Uint8Array(Object.values(dataField));
+          data[field] = new Uint8Array(Object.values(dataField));
         }
       });
     }

diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts
@@ -2112,9 +2112,10 @@ export class ConversationRepository {
     }
 
     const {conversation, qualified_conversation, data: eventData, type} = eventJson;
+    const dataConversationId: string = (eventData as any).conversationId;
     // data.conversationId is always the conversationId that should be read first. If not found we can fallback to qualified_conversation or conversation
-    const conversationId: QualifiedId = eventData?.conversationId
-      ? {domain: '', id: eventData.conversationId}
+    const conversationId: QualifiedId = dataConversationId
+      ? {domain: '', id: dataConversationId}
       : qualified_conversation || {domain: '', id: conversation};
 
     const inSelfConversation = this.conversationState.isSelfConversation(conversationId);
@@ -2224,18 +2225,15 @@ export class ConversationRepository {
       const isFromUnknownUser = allParticipants.every(participant => participant.id !== senderId);
 
       if (isFromUnknownUser) {
-        const membersUpdateMessages = [
-          CONVERSATION_EVENT.MEMBER_LEAVE,
-          CONVERSATION_EVENT.MEMBER_JOIN,
-          ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE,
-        ];
-        const isMembersUpdateEvent = membersUpdateMessages.includes(eventJson.type);
-        if (isMembersUpdateEvent) {
-          const isFromUpdatedMember = eventJson.data.user_ids?.includes(senderId);
-          if (isFromUpdatedMember) {
-            // we ignore leave/join events that are sent by the user actually leaving or joining
-            return conversationEntity;
-          }
+        switch (eventJson.type) {
+          case CONVERSATION_EVENT.MEMBER_LEAVE:
+          case CONVERSATION_EVENT.MEMBER_JOIN:
+          case ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE:
+            const isFromUpdatedMember = eventJson.data.user_ids?.includes(senderId);
+            if (isFromUpdatedMember) {
+              // we ignore leave/join events that are sent by the user actually leaving or joining
+              return conversationEntity;
+            }
         }
 
         const message = `Received '${type}' event from user '${senderId}' unknown in '${conversationEntity.id}'`;
@@ -2272,7 +2270,7 @@ export class ConversationRepository {
       data: {legal_hold_status: messageLegalHoldStatus},
       from: userId,
       time: isoTimestamp,
-    } = eventJson;
+    } = eventJson as any;
     const timestamp = new Date(isoTimestamp).getTime();
     const qualifiedConversation = qualified_conversation || {domain: '', id: conversationId};
     const qualifiedUser = qualified_from || {domain: '', id: userId};

diff --git a/src/script/conversation/ConversationStateHandler.ts b/src/script/conversation/ConversationStateHandler.ts
@@ -128,7 +128,7 @@ export class ConversationStateHandler extends AbstractConversationEventHandler {
 
   private _mapConversationAccessState(
     conversationEntity: Conversation,
-    eventJson: ConversationEvent<ConversationAccessUpdateData>,
+    eventJson: ConversationEvent<CONVERSATION_EVENT.ACCESS_UPDATE, ConversationAccessUpdateData>,
   ): void {
     const {access: accessModes, ...roles} = eventJson.data;
     ConversationMapper.mapAccessState(conversationEntity, accessModes, roles?.access_role, roles?.access_role_v2);
@@ -140,7 +140,7 @@ export class ConversationStateHandler extends AbstractConversationEventHandler {
 
   private _updateConversationAccessCode(
     conversationEntity: Conversation,
-    eventJson: ConversationEvent<ConversationCode>,
+    eventJson: ConversationEvent<CONVERSATION_EVENT.CODE_UPDATE, ConversationCode>,
   ): void {
     ConversationMapper.mapAccessCode(conversationEntity, eventJson.data);
   }