From e717a6b1628f2b5bdc07ac539040b7777fffafa2 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:31:48 -0400
Subject: [PATCH] BetterActivites: Patch Optimizations

---
 src/equicordplugins/betterActivities/index.tsx | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index 1f9fca2b9..86fc8c7ed 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -55,17 +55,8 @@ export default definePlugin({
             // Show all activities in the user popout/sidebar
             find: '"UserProfilePopoutBody"',
             replacement: {
-                match: /(?<=(\i)\.id\)\}\)\),(\i).*?,)\i\?.{0,250}onClose:\i\}\)/,
-                replace: "$self.showAllActivitiesComponent({ activity: $2, user: $1 })"
-            },
-            predicate: () => settings.store.userPopout
-        },
-        // DM Sidebar
-        {
-            find: ".SIDEBAR}),nicknameIcons",
-            replacement: {
-                match: /(?<=(\i)\.id\)\}\)\),(\i).*?,)\i\?.{0,250}\i\.card\}\)/,
-                replace: "$self.showAllActivitiesComponent({ activity: $2, user: $1 })"
+                match: /((\i)=.{0,10}(\i)\.id\).*?,)\i\?.{0,250}onClose:\i\}\)/,
+                replace: "$1$self.showAllActivitiesComponent({ activity: $2, user: $3 })"
             },
             predicate: () => settings.store.userPopout
         },
@@ -73,8 +64,8 @@ export default definePlugin({
         {
             find: "#{intl::STATUS_MENU_LABEL}",
             replacement: {
-                match: /(?<=,(\i)=.{0,10}\i\.id.{0,150}userId:(\i).*?,)\i\?.{0,250}onClose:\i\}\)/,
-                replace: "$self.showAllActivitiesComponent({ activity: $1, user: $2 })"
+                match: /((\i)=.{0,10}(\i)\.id\).*?,)\i\?.{0,250}onClose:\i\}\)/,
+                replace: "$1$self.showAllActivitiesComponent({ activity: $2, user: $3 })"
             },
             predicate: () => settings.store.userPopout
         }