From c4a8c55a21b7ede1294aef0ca6e8f4cd974dda4c Mon Sep 17 00:00:00 2001 From: PatrykBuniX Date: Thu, 18 Jan 2024 20:38:59 +0100 Subject: [PATCH 1/3] runfix: exclude self mls conversation from setting verification state --- .../MLS/MLSStateHandler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts index 342756d8641..1d1da97e801 100644 --- a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts +++ b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts @@ -17,6 +17,7 @@ * */ +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; import {QualifiedId} from '@wireapp/api-client/lib/user'; import {E2eiConversationState} from '@wireapp/core/lib/messagingProtocols/mls'; import {container} from 'tsyringe'; @@ -99,7 +100,8 @@ class MLSConversationVerificationStateHandler { return this.logger.warn(`Epoch changed but conversation could not be found after waiting for 5 seconds`); } - if (!isMLSConversation(conversation)) { + const isSelfMLSConversation = isMLSConversation(conversation) && conversation.type() === CONVERSATION_TYPE.SELF; + if (!isMLSConversation(conversation) || isSelfMLSConversation) { return; } From 082490de5b0f0ba3823327de64feeb429519e7d0 Mon Sep 17 00:00:00 2001 From: PatrykBuniX Date: Mon, 22 Jan 2024 13:53:48 +0100 Subject: [PATCH 2/3] refactor: simplify if statement --- .../MLS/MLSStateHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts index 1d1da97e801..ddde7d78d6d 100644 --- a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts +++ b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts @@ -100,8 +100,8 @@ class MLSConversationVerificationStateHandler { return this.logger.warn(`Epoch changed but conversation could not be found after waiting for 5 seconds`); } - const isSelfMLSConversation = isMLSConversation(conversation) && conversation.type() === CONVERSATION_TYPE.SELF; - if (!isMLSConversation(conversation) || isSelfMLSConversation) { + const isSelfConversation = conversation.type() === CONVERSATION_TYPE.SELF; + if (!isMLSConversation(conversation) || isSelfConversation) { return; } From 2da3fa40dcf7b9c439dd07b65e801f777d37fdec Mon Sep 17 00:00:00 2001 From: PatrykBuniX Date: Mon, 22 Jan 2024 15:30:10 +0100 Subject: [PATCH 3/3] chore: unstuck ci please