chore: Revert "fix: handle user.delete event [WPB-18869] (#19424)"

This reverts commit cb049ec.

Author: V-Gira

src/i18n/de-DE.json

@@ -548,7 +548,6 @@
   "conversationLikesCaptionSingular": "[bold]{userName}[/bold]",
   "conversationLocationLink": "Standort anzeigen",
   "conversationMLSMigrationFinalisationOngoingCall": "Aufgrund der Umstellung auf MLS haben Sie möglicherweise Probleme mit Ihrem aktuellen Anruf. Wenn das der Fall ist, legen Sie auf und rufen Sie erneut an.",
-  "conversationMemberDeleted": "Dieser Benutzer ist nicht mehr verfügbar",
   "conversationMemberJoined": "[bold]{name}[/bold] hat {users} hinzugefügt",
   "conversationMemberJoinedMore": "[bold]{name}[/bold] hat {users} und [showmore]{count} andere[/showmore] hinzugefügt",
   "conversationMemberJoinedSelf": "[bold]{name}[/bold] ist beigetreten",

src/i18n/en-US.json

@@ -551,7 +551,6 @@
   "conversationLikesCaptionSingular": "[bold]{userName}[/bold]",
   "conversationLocationLink": "Open Map",
   "conversationMLSMigrationFinalisationOngoingCall": "Due to migration to MLS, you might have issues with your current call. If that's the case, hang up and call again.",
-  "conversationMemberDeleted": "This user is no longer available",
   "conversationMemberJoined": "[bold]{name}[/bold] added {users} to the conversation",
   "conversationMemberJoinedMore": "[bold]{name}[/bold] added {users}, and [showmore]{count} more[/showmore] to the conversation",
   "conversationMemberJoinedSelf": "[bold]{name}[/bold] joined",

src/script/components/MessagesList/Message/MemberMessage/MessageContent.tsx

@@ -184,11 +184,6 @@ function getContent(message: MemberMessageEntity) {
       if (!actor.id) {
         return t('conversationMemberWereRemoved', {users: allUsers}, {}, true);
       }
-
-      if (message.reason === MemberLeaveReason.USER_DELETED) {
-        return t('conversationMemberDeleted');
-      }
-
       return actor.isMe
         ? t('conversationMemberRemovedYou', {users: allUsers}, {}, true)
         : t('conversationMemberRemoved', {name, users: allUsers}, {}, true);

src/script/conversation/ConversationRepository.ts

@@ -383,7 +383,6 @@ export class ConversationRepository {
 
     this.selfRepository.on('selfSupportedProtocolsUpdated', this.initAllLocal1To1Conversations);
     this.userRepository.on('supportedProtocolsUpdated', this.onUserSupportedProtocolsUpdated);
-    this.userRepository.on('userDeleted', this.onUserDeleted);
   }
 
   public initMLSConversationRecoveredListener() {
@@ -2440,29 +2439,6 @@ export class ConversationRepository {
     return this.eventRepository.injectEvent(event, EventRepository.SOURCE.INJECTED);
   }
 
-  /**
-   * Will inject a member deleted event in 1:1 conversations with that user.
-   * This will be used to notify the other user that the user was deleted.
-   *
-   * @param userId User ID of the user that was deleted
-   */
-
-  private readonly onUserDeleted = async (userId: QualifiedId) => {
-    const found1to1Conversation = this.conversationState.get1to1ConversationWithUser(userId);
-    if (!found1to1Conversation) {
-      return;
-    }
-
-    const deletedEvent = EventBuilder.buildMemberLeave(
-      found1to1Conversation,
-      [userId],
-      '',
-      this.serverTimeHandler.toServerTimestamp(),
-      MemberLeaveReason.USER_DELETED,
-    );
-    await this.eventRepository.injectEvent(deletedEvent, EventRepository.SOURCE.INJECTED);
-  };
-
   /**
    * Add service to conversation.
    *

src/script/conversation/ConversationState.ts

@@ -227,23 +227,6 @@ export class ConversationState {
     return mlsConversation || null;
   }
 
-  /**
-   * Get a 1:1 conversation with a user.
-   * @param userId User ID
-   * @returns Conversation with the user or undefined if not found
-   */
-  get1to1ConversationWithUser(userId: QualifiedId): Conversation | undefined {
-    const foundMLSConversation = this.findMLS1to1Conversation(userId);
-    if (foundMLSConversation) {
-      return foundMLSConversation;
-    }
-    const foundProteusConversations = this.findProteus1to1Conversations(userId);
-    if (foundProteusConversations && foundProteusConversations.length > 0) {
-      return foundProteusConversations[0];
-    }
-    return undefined;
-  }
-
   has1to1ConversationWithUser(userId: QualifiedId): boolean {
     const foundMLSConversation = this.findMLS1to1Conversation(userId);
     if (foundMLSConversation) {

src/script/conversation/EventBuilder.ts

@@ -533,14 +533,12 @@ export const EventBuilder = {
     userIds: QualifiedId[],
     from: string,
     currentTimestamp: number,
-    reason?: MemberLeaveReason,
   ): MemberLeaveEvent {
     return {
       ...buildQualifiedId(conversationEntity),
       data: {
         qualified_user_ids: userIds,
         user_ids: userIds.map(({id}) => id),
-        reason,
       },
       from: from,
       time: conversationEntity.getNextIsoDate(currentTimestamp),

src/script/user/UserRepository.ts

@@ -105,16 +105,7 @@ interface UserAvailabilityEvent {
   type: USER.AVAILABILITY;
 }
 
-type Events = {
-  supportedProtocolsUpdated: {user: User; supportedProtocols: ConversationProtocol[]};
-  userDeleted: QualifiedId;
-};
-
-type UserDeleteEventWithQualifiedId = {
-  id: string;
-  qualified_id: QualifiedId;
-  type: USER_EVENT.DELETE;
-};
+type Events = {supportedProtocolsUpdated: {user: User; supportedProtocols: ConversationProtocol[]}};
 export class UserRepository extends TypedEventEmitter<Events> {
   private readonly logger: Logger;
   public readonly userMapper: UserMapper;
@@ -164,8 +155,7 @@ export class UserRepository extends TypedEventEmitter<Events> {
 
     switch (eventJson.type) {
       case USER_EVENT.DELETE:
-        const userDeleteEvent = eventJson as UserDeleteEventWithQualifiedId;
-        this.userDelete(userDeleteEvent);
+        this.userDelete(eventJson);
         break;
       case USER_EVENT.UPDATE:
         await this.onUserUpdate(eventJson, source);
@@ -293,9 +283,9 @@ export class UserRepository extends TypedEventEmitter<Events> {
   /**
    * Event to delete the matching user.
    */
-  private userDelete({qualified_id}: {qualified_id: QualifiedId}): void {
+  private userDelete({id}: {id: string}): void {
     // @todo Add user deletion cases for other users
-    const isSelfUser = matchQualifiedIds(qualified_id, this.userState.self()?.qualifiedId);
+    const isSelfUser = id === this.userState.self().id;
     if (isSelfUser) {
       // Info: Deletion of the user causes a database deletion which may interrupt currently running database operations.
       // That's why we added a timeout, to leave some time for the database to finish running reads/writes before the
@@ -304,7 +294,6 @@ export class UserRepository extends TypedEventEmitter<Events> {
         amplify.publish(WebAppEvents.LIFECYCLE.SIGN_OUT, SIGN_OUT_REASON.ACCOUNT_DELETED, true);
       }, 100);
     }
-    this.emit('userDeleted', qualified_id);
   }
 
   private async onUserUpdate(eventJson: UserUpdateEvent, source: EventSource): Promise<void> {

src/types/i18n.d.ts

@@ -555,7 +555,6 @@ declare module 'I18n/en-US.json' {
     'conversationLikesCaptionSingular': `[bold]{userName}[/bold]`;
     'conversationLocationLink': `Open Map`;
     'conversationMLSMigrationFinalisationOngoingCall': `Due to migration to MLS, you might have issues with your current call. If that\'s the case, hang up and call again.`;
-    'conversationMemberDeleted': `This user is no longer available`;
     'conversationMemberJoined': `[bold]{name}[/bold] added {users} to the conversation`;
     'conversationMemberJoinedMore': `[bold]{name}[/bold] added {users}, and [showmore]{count} more[/showmore] to the conversation`;
     'conversationMemberJoinedSelf': `[bold]{name}[/bold] joined`;