feat: new copy when trying to open a 1:1 with blocked user

wireapp · Jan 18, 2024 · eb97aca · eb97aca
1 parent 1925336
commit eb97aca
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
@@ -496,6 +496,8 @@
   "conversationNewConversation": "Communication in Wire is always end-to-end encrypted. Everything you send and receive in this conversation is only accessible to you and your contact.",
   "conversationNotClassified": "Security level: Unclassified",
   "conversationNotFoundMessage": "You may not have permission with this account or it no longer exists.",
+  "conversationWithBlockedUserMessage": "The link to this group conversation is no longer valid or leads to a conversation with someone you blocked.",
+  "conversationWithBlockedUserTitle": "Conversation not reachable",
   "conversationNotFoundTitle": "{{brandName}} can’t open this conversation.",
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",

diff --git a/src/script/error/ConversationError.ts b/src/script/error/ConversationError.ts
@@ -21,6 +21,7 @@ import {BaseError, BASE_ERROR_TYPE} from './BaseError';
 
 enum CONVERSATION_ERROR_TYPE {
   CONVERSATION_NOT_FOUND = 'CONVERSATION_NOT_FOUND',
+  CONVERSATION_WITH_BLOCKED_USER = 'CONVERSATION_WITH_BLOCKED_USER',
   INVALID_PARAMETER = 'INVALID_PARAMETER',
   LEGAL_HOLD_CONVERSATION_CANCELLATION = 'LEGAL_HOLD_CONVERSATION_CANCELLATION',
   MESSAGE_NOT_FOUND = 'MESSAGE_NOT_FOUND',
@@ -46,6 +47,7 @@ export class ConversationError extends BaseError {
   static get MESSAGE(): Record<CONVERSATION_ERROR_TYPE | string, string> {
     return {
       CONVERSATION_NOT_FOUND: 'Conversation not found',
+      CONVERSATION_WITH_BLOCKED_USER: 'Conversation not reachable',
       INVALID_PARAMETER: 'Invalid parameter passed',
       LEGAL_HOLD_CONVERSATION_CANCELLATION: 'Sending to legal hold conversation was canceled by user',
       MESSAGE_NOT_FOUND: 'Message not found in conversation',
@@ -64,6 +66,7 @@ export class ConversationError extends BaseError {
   static get TYPE(): Record<CONVERSATION_ERROR_TYPE, CONVERSATION_ERROR_TYPE> {
     return {
       CONVERSATION_NOT_FOUND: CONVERSATION_ERROR_TYPE.CONVERSATION_NOT_FOUND,
+      CONVERSATION_WITH_BLOCKED_USER: CONVERSATION_ERROR_TYPE.CONVERSATION_WITH_BLOCKED_USER,
       INVALID_PARAMETER: CONVERSATION_ERROR_TYPE.INVALID_PARAMETER,
       LEGAL_HOLD_CONVERSATION_CANCELLATION: CONVERSATION_ERROR_TYPE.LEGAL_HOLD_CONVERSATION_CANCELLATION,
       MESSAGE_NOT_FOUND: CONVERSATION_ERROR_TYPE.MESSAGE_NOT_FOUND,

diff --git a/src/script/view_model/ContentViewModel.ts b/src/script/view_model/ContentViewModel.ts
@@ -219,10 +219,27 @@ export class ContentViewModel {
     );
   }
 
+  private showConversationWithBlockedUserErrorModal(): void {
+    PrimaryModal.show(
+      PrimaryModal.type.ACKNOWLEDGE,
+      {
+        text: {
+          message: t('conversationWithBlockedUserMessage'),
+          title: t('conversationWithBlockedUserTitle'),
+        },
+      },
+      undefined,
+    );
+  }
+
   private isConversationNotFoundError(error: any): boolean {
     return error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
   }
 
+  private isConversationWithBlockedUserError(error: any): boolean {
+    return error.type === ConversationError.TYPE.CONVERSATION_WITH_BLOCKED_USER;
+  }
+
   /**
    * Opens the specified conversation.
    *
@@ -251,14 +268,22 @@ export class ContentViewModel {
       const conversationEntity = await this.getConversationEntity(conversation, domain);
       const isConnectionBlocked = conversationEntity?.connection()?.isBlocked();
 
-      if (!conversationEntity || isConnectionBlocked) {
+      if (!conversationEntity) {
         this.closeRightSidebar();
         throw new ConversationError(
           ConversationError.TYPE.CONVERSATION_NOT_FOUND,
           ConversationError.MESSAGE.CONVERSATION_NOT_FOUND,
         );
       }
 
+      if (isConnectionBlocked) {
+        this.closeRightSidebar();
+        throw new ConversationError(
+          ConversationError.TYPE.CONVERSATION_WITH_BLOCKED_USER,
+          ConversationError.MESSAGE.CONVERSATION_WITH_BLOCKED_USER,
+        );
+      }
+
       const isActiveConversation = this.conversationState.isActiveConversation(conversationEntity);
 
       if (!isActiveConversation) {
@@ -277,10 +302,14 @@ export class ContentViewModel {
       this.showAndNavigate(conversationEntity, openNotificationSettings);
     } catch (error: any) {
       if (this.isConversationNotFoundError(error)) {
-        this.showConversationNotFoundErrorModal();
-      } else {
-        throw error;
+        return this.showConversationNotFoundErrorModal();
       }
+
+      if (this.isConversationWithBlockedUserError(error)) {
+        return this.showConversationWithBlockedUserErrorModal();
+      }
+
+      throw error;
     }
   };