From 4d0b1e3607fbb809c4fc68ad21e8a4858660aa37 Mon Sep 17 00:00:00 2001
From: Thomas Belin <thomasbelin4@gmail.com>
Date: Wed, 1 Nov 2023 15:22:11 +0100
Subject: [PATCH] fix: Use qualified Ids when matching users for search
 filtering [WPB-4823] (#16138)

---
 src/script/components/UserSearchableList.tsx         |  3 +--
 src/script/conversation/ConversationState.ts         |  8 ++++++++
 .../page/LeftSidebar/panels/StartUI/PeopleTab.tsx    | 12 ++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/script/components/UserSearchableList.tsx b/src/script/components/UserSearchableList.tsx
index ef988ee58b7..0b747dae1fa 100644
--- a/src/script/components/UserSearchableList.tsx
+++ b/src/script/components/UserSearchableList.tsx
@@ -98,14 +98,13 @@ const UserSearchableList: React.FC<UserListProps> = ({
   // Filter all list items if a filter is provided
 
   useEffect(() => {
-    const connectedUsers = conversationState.connectedUsers();
     const {query: normalizedQuery} = searchRepository.normalizeQuery(filter);
     const results = searchRepository
       .searchUserInSet(filter, users)
       .filter(
         user =>
           user.isMe ||
-          connectedUsers.includes(user) ||
+          conversationState.hasConversationWith(user) ||
           teamRepository.isSelfConnectedTo(user.id) ||
           user.username() === normalizedQuery,
       );
diff --git a/src/script/conversation/ConversationState.ts b/src/script/conversation/ConversationState.ts
index dddd57f785a..a0476b0b8dc 100644
--- a/src/script/conversation/ConversationState.ts
+++ b/src/script/conversation/ConversationState.ts
@@ -195,6 +195,14 @@ export class ConversationState {
         });
   }
 
+  /**
+   * indicate whether the selfUser has a conversation (1:1 or group conversation) with this other user
+   * @param user the user to check
+   */
+  hasConversationWith(user: User) {
+    return this.connectedUsers().some(connectedUser => matchQualifiedIds(connectedUser.qualifiedId, user.qualifiedId));
+  }
+
   isSelfConversation(conversationId: QualifiedId): boolean {
     const selfConversationIds: QualifiedId[] = [this.selfProteusConversation(), this.selfMLSConversation()]
       .filter((conversation): conversation is Conversation => !!conversation)
diff --git a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
index 206e268c476..8dc822a55c1 100644
--- a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
+++ b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
@@ -101,10 +101,10 @@ export const PeopleTab = ({
   const [hasFederationError, setHasFederationError] = useState(false);
   const currentSearchQuery = useRef('');
 
-  const {connectedUsers} = useKoSubscribableChildren(conversationState, ['connectedUsers']);
   const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
 
   const getLocalUsers = (unfiltered?: boolean) => {
+    const connectedUsers = conversationState.connectedUsers();
     if (!canSearchUnconnectedUsers) {
       return connectedUsers;
     }
@@ -118,7 +118,9 @@ export const PeopleTab = ({
 
       contacts = unfiltered
         ? teamUsers
-        : teamUsers.filter(user => connectedUsers.includes(user) || teamRepository.isSelfConnectedTo(user.id));
+        : teamUsers.filter(
+            user => conversationState.hasConversationWith(user) || teamRepository.isSelfConnectedTo(user.id),
+          );
     }
 
     return contacts.filter(user => user.isAvailable());
@@ -178,9 +180,11 @@ export const PeopleTab = ({
       const localSearchSources = getLocalUsers(true);
 
       const contactResults = searchRepository.searchUserInSet(searchQuery, localSearchSources);
-      const connectedUsers = conversationState.connectedUsers();
       const filteredResults = contactResults.filter(
-        user => connectedUsers.includes(user) || teamRepository.isSelfConnectedTo(user.id) || user.username() === query,
+        user =>
+          conversationState.hasConversationWith(user) ||
+          teamRepository.isSelfConnectedTo(user.id) ||
+          user.username() === query,
       );
 
       const localSearchResults: SearchResultsData = {