From d586b33bef96b7a53a0cf765a1e2a20e2759873c Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 11 Apr 2025 22:40:24 -0400
Subject: [PATCH] Patch Fixes

---
 src/equicordplugins/betterActivities/index.tsx  | 2 +-
 src/plugins/accountPanelServerProfile/index.tsx | 2 +-
 src/plugins/roleColorEverywhere/index.tsx       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index b87f8ff3..ec4c0f41 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -46,7 +46,7 @@ export default definePlugin({
             // Show all activities in the user popout/sidebar
             find: '"UserProfilePopoutBody"',
             replacement: {
-                match: /(?<=(\i)\.id\)\}\)\),(\i).*?)\(0,.{0,100}\i\.activity\}\)/,
+                match: /(?<=(\i)\.id\)\}\)\),(\i).*?)\(0,.{0,100}\i\.id,onClose:\i\}\)/,
                 replace: "$self.showAllActivitiesComponent({ activity: $2, user: $1 })"
             },
             predicate: () => settings.store.userPopout
diff --git a/src/plugins/accountPanelServerProfile/index.tsx b/src/plugins/accountPanelServerProfile/index.tsx
index 2b212d34..7115ae41 100644
--- a/src/plugins/accountPanelServerProfile/index.tsx
+++ b/src/plugins/accountPanelServerProfile/index.tsx
@@ -77,7 +77,7 @@ export default definePlugin({
                     replace: "$self.useAccountPanelRef();$&"
                 },
                 {
-                    match: /(\.AVATAR,children:.+?renderPopout:(\i)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
+                    match: /(\.AVATAR,children:.+?renderPopout:\((\i),\i\)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
                     replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},originalRenderPopout:()=>{${originalPopout}}})`
                 },
                 {
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index f16161fa..04b1ec8e 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -85,7 +85,7 @@ export default definePlugin({
             find: ".USER_MENTION)",
             replacement: [
                 {
-                    match: /(?<=onContextMenu:\i,color:)\i(?=,onClick)(?<=user:(\i),channel:(\i).+?)/,
+                    match: /(?<=onContextMenu:\i,color:)\i(?=\},)(?<=user:(\i),channel:(\i).+?)/,
                     replace: "$self.getColorInt($1?.id,$2?.id)",
                 }
             ],