From a1392f0013c787796d18bb98ef84297a9fc7dc8c Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Fri, 24 Oct 2025 13:34:19 -0400 Subject: [PATCH] FriendTags: Fix Using Multiple Tags --- src/equicordplugins/friendTags/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/equicordplugins/friendTags/index.tsx b/src/equicordplugins/friendTags/index.tsx index 1453d244b..0f893cdb8 100644 --- a/src/equicordplugins/friendTags/index.tsx +++ b/src/equicordplugins/friendTags/index.tsx @@ -25,9 +25,10 @@ let SavedData: UserTagData[] = []; const tagStoreName = "vc-friendtags-tags"; function parseUsertags(text: string): string[] { - const match = text.match(/&(.+)/); - if (!match) return []; - return [match[1].trim()]; + const matches = text.match(/&([^&]+)/g); + if (!matches) return []; + const tags = matches.map(match => match.substring(1).trim()); + return tags.filter(tag => tag !== ""); } function queryFriendTags(query) { @@ -40,7 +41,7 @@ function queryFriendTags(query) { if (!filteredTagObjects.length) return []; const users = Array.from(new Set([...ChannelStore.getDMUserIds(), ...RelationshipStore.getFriendIDs()])) - .filter(user => filteredTagObjects.every(tag => tag.userIds.includes(user))); + .filter(user => filteredTagObjects.some(tag => tag.userIds.includes(user))); return users.map(user => { const userObject: any = UserStore.getUser(user); @@ -183,7 +184,6 @@ function UserToTagID(user, tag, remove) { } const userPatch: NavContextMenuPatchCallback = (children, { user }) => { - const buttonElement =