From bafbc7960158ed642e57616132dd5413b845af2d Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Mon, 14 Apr 2025 23:23:07 -0400
Subject: [PATCH] Reapply "Canary Fixes"

This reverts commit 864457d98329e84bbbc8fcbaa4adfae50e72af20.
---
 src/equicordplugins/betterActivities/index.tsx   | 2 +-
 src/equicordplugins/betterBlockedUsers/index.tsx | 2 +-
 src/equicordplugins/friendCodes/index.tsx        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index ec4c0f41..a797b7e1 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -44,7 +44,7 @@ export default definePlugin({
         },
         {
             // Show all activities in the user popout/sidebar
-            find: '"UserProfilePopoutBody"',
+            find: "hasAvatarForGuild(null",
             replacement: {
                 match: /(?<=(\i)\.id\)\}\)\),(\i).*?)\(0,.{0,100}\i\.id,onClose:\i\}\)/,
                 replace: "$self.showAllActivitiesComponent({ activity: $2, user: $1 })"
diff --git a/src/equicordplugins/betterBlockedUsers/index.tsx b/src/equicordplugins/betterBlockedUsers/index.tsx
index 258933d2..b3d64864 100644
--- a/src/equicordplugins/betterBlockedUsers/index.tsx
+++ b/src/equicordplugins/betterBlockedUsers/index.tsx
@@ -83,7 +83,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "UserProfileModalHeaderActionButtons",
+            find: "#{intl::OUTGOING_FRIEND_REQUEST}",
             replacement: [
                 {
                     match: /(?<=return \i)\|\|(\i)===.*?.FRIEND/,
diff --git a/src/equicordplugins/friendCodes/index.tsx b/src/equicordplugins/friendCodes/index.tsx
index 967230a7..b2d74c22 100644
--- a/src/equicordplugins/friendCodes/index.tsx
+++ b/src/equicordplugins/friendCodes/index.tsx
@@ -19,7 +19,8 @@ export default definePlugin({
             replacement: {
                 match: /header,children:\[.*?\{\}\)/,
                 replace: "$&,$self.FriendCodesPanel"
-            }
+            },
+            noWarn: true,
         }
     ],