From 15c1af2b6b39edeb6cfbe5f8f7ddfa0450e60dc6 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 12 Jun 2025 02:06:17 -0400
Subject: [PATCH] Fixes

---
 src/equicordplugins/clientSideBlock/index.tsx | 43 ++++++++++++++++---
 src/plugins/implicitRelationships/index.ts    |  2 +-
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/equicordplugins/clientSideBlock/index.tsx b/src/equicordplugins/clientSideBlock/index.tsx
index 279ef958..cf6415bc 100644
--- a/src/equicordplugins/clientSideBlock/index.tsx
+++ b/src/equicordplugins/clientSideBlock/index.tsx
@@ -206,11 +206,17 @@ export default definePlugin({
         },
         // active now list
         {
-            find: "getUserAffinitiesUserIds(){",
-            replacement: {
-                match: /return (\i.affinityUserIds)/,
-                replace: "return new Set(Array.from($1).filter(id => !$self.shouldHideUser(id)))"
-            }
+            find: "NOW_PLAYING_CARD_HOVERED,",
+            replacement: [
+                {
+                    match: /(\{party:)(\i)(.*?\}=\i)/,
+                    replace: "$1eq_$2$3,$2=$self.partyFilterIgnoredUsers(eq_$2)",
+                },
+                {
+                    match: /\{party:(\i).*,\i=\i\(\)\(\i,\i\);/,
+                    replace: "$&if($self.shoudBeNull($1)){return null;}"
+                }
+            ]
         },
         // mutual friends list in user profile
         {
@@ -220,5 +226,30 @@ export default definePlugin({
                 replace: "$1if($2 != undefined) return $2.filter(u => !$self.shouldHideUser(u.key))"
             }
         }
-    ]
+    ],
+    partyFilterIgnoredUsers,
+    shoudBeNull
 });
+
+// From https://github.com/Vendicated/Vencord/blob/29060f9ec9359a036fa83e61b5378a19789481dd/src/plugins/HideInActiveNow/index.ts
+
+function partyFilterIgnoredUsers(party) {
+    const filteredPartyMembers = party.partiedMembers.filter(user => shouldHideUser(user));
+    const filteredPartyMembersLength = filteredPartyMembers.length;
+    if (filteredPartyMembersLength === 0) return { ...party, partiedMembers: [] };
+
+    const filteredParty = {
+        ...party,
+        partiedMembers: filteredPartyMembers,
+        currentActivities: party.currentActivities,
+        priorityMembers: party.priorityMembers,
+        voiceChannels: party.voiceChannels
+    };
+    return filteredParty;
+}
+
+function shoudBeNull(party) {
+    if (!party) return true;
+    if (party.partiedMembers.length === 0) return true;
+    return false;
+}
diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 13c12ed9..9bd428e0 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -23,7 +23,7 @@ import { findStoreLazy } from "@webpack";
 import { Constants, FluxDispatcher, GuildStore, RelationshipStore, RestAPI, SnowflakeUtils, UserStore } from "@webpack/common";
 import { Settings } from "Vencord";
 
-const UserAffinitiesStore = findStoreLazy("UserAffinitiesStore");
+const UserAffinitiesStore = findStoreLazy("UserAffinitiesV2Store");
 
 export default definePlugin({
     name: "ImplicitRelationships",