From f512ea2bf278c183db8964da171afc3d17facb90 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:51:57 -0500
Subject: [PATCH] Fix Conflict

---
 src/equicordplugins/betterActivities/index.tsx      | 2 +-
 src/equicordplugins/songSpotlight.desktop/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index f5c35f122..bea8c1136 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -43,7 +43,7 @@ export default definePlugin({
         },
         {
             // Show all activities in the user popout/sidebar
-            find: /\.POPOUT,onClose:\i}\),nicknameIcons:.+?\.isProvisional/,
+            find: /onOpenUserProfileModal:\i,onClose:\i\}\),null/,
             replacement: {
                 match: /((\i)=.{0,10}(\i)\.id\).*?,onInteraction:\i\}\),).{0,250}onClose:\i\}\)/,
                 replace: "$1$self.showAllActivitiesComponent({ activity: $2, user: $3 })"
diff --git a/src/equicordplugins/songSpotlight.desktop/index.tsx b/src/equicordplugins/songSpotlight.desktop/index.tsx
index cf8ee449c..f69bab5f2 100644
--- a/src/equicordplugins/songSpotlight.desktop/index.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/index.tsx
@@ -49,7 +49,7 @@ export default definePlugin({
         {
             find: ".SIDEBAR}),nicknameIcons:",
             replacement: {
-                match: /{userId:(\i)\.id}\)}\)]}\)/,
+                match: /{userId:(\i)\.id}\)}\)]}\).{0,100}(?=\]\}\))/,
                 replace: "$&,$self.renderProfileSongs({userId:$1.id})",
             },
         },