From 30e1f3478271ee4cccfc5540dbe30bca2f9c5acb Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 10 Mar 2022 17:22:39 +1100 Subject: [PATCH] fix configuration message may include contacts that shouldn't be visible --- .../ConfigurationMessage+Convenience.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift b/SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift index e4312c232..ad1e6979b 100644 --- a/SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift +++ b/SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift @@ -55,17 +55,16 @@ extension ConfigurationMessage { return ( // Skip the current user - contact.sessionID != currentUserPublicKey && ( + contact.sessionID != currentUserPublicKey && + // Contacts which have visible threads + TSContactThread.fetch(uniqueId: threadID, transaction: transaction)?.shouldBeVisible == true && ( // Include already approved contacts contact.isApproved || contact.didApproveMe || // Sync blocked contacts - SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID) || - - // Contacts which have visible threads (sanity check - should be included as already approved) - TSContactThread.fetch(uniqueId: threadID, transaction: transaction)?.shouldBeVisible == true + SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID) ) ) }