From 5fb7ad2ad09cb25258d9045e9c779392fabba367 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 16 Apr 2025 10:08:14 -0400
Subject: [PATCH] Canary Fixes

---
 src/equicordplugins/bannersEverywhere/index.tsx | 6 +++---
 src/equicordplugins/betterActivities/index.tsx  | 2 +-
 src/equicordplugins/clientSideBlock/index.tsx   | 2 +-
 src/equicordplugins/customTimestamps/index.tsx  | 4 ++--
 src/equicordplugins/customUserColors/index.tsx  | 2 +-
 src/plugins/_api/memberListDecorators/index.tsx | 4 ++--
 src/plugins/ircColors/index.ts                  | 4 ++--
 src/webpack/common/utils.ts                     | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/equicordplugins/bannersEverywhere/index.tsx b/src/equicordplugins/bannersEverywhere/index.tsx
index ad804c89..ab3e8da0 100644
--- a/src/equicordplugins/bannersEverywhere/index.tsx
+++ b/src/equicordplugins/bannersEverywhere/index.tsx
@@ -58,8 +58,8 @@ export default definePlugin({
             replacement: [
                 {
                     // We add the banner as a property while we can still access the user id
-                    match: /(?<=nameplate:(\i).*?)verified:(\i).isVerifiedBot.*?name:null.*?(?=avatar:)/,
-                    replace: "$&banner:$self.memberListBannerHook($2, $1),",
+                    match: /verified:(\i).isVerifiedBot.*?nameplate:(\i).*?name:null.*?(?=avatar:)/,
+                    replace: "$&banner:$self.memberListBannerHook($1, $2),",
                 },
                 {
                     match: /(?<=\),nameplate:)(\i)/,
@@ -112,7 +112,7 @@ export default definePlugin({
         }
 
         return (
-            <img id={`vc-banners-everywhere-${user.id}`} src={url} className="vc-banners-everywhere-memberlist"></img>
+            <img alt="" id={`vc-banners-everywhere-${user.id}`} src={url} className="vc-banners-everywhere-memberlist"></img>
         );
     },
 
diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index a797b7e1..6212eb33 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -35,7 +35,7 @@ export default definePlugin({
     patches: [
         {
             // Patch activity icons
-            find: '"activity-status-web"',
+            find: "isBlockedOrIgnored(null",
             replacement: {
                 match: /(?<=hideTooltip:.{0,4}}=(\i).*?{}\))\]/,
                 replace: ",$self.patchActivityList($1)]"
diff --git a/src/equicordplugins/clientSideBlock/index.tsx b/src/equicordplugins/clientSideBlock/index.tsx
index 206a4cf4..279ef958 100644
--- a/src/equicordplugins/clientSideBlock/index.tsx
+++ b/src/equicordplugins/clientSideBlock/index.tsx
@@ -152,7 +152,7 @@ export default definePlugin({
         {
             find: "._areActivitiesExperimentallyHidden=(",
             replacement: {
-                match: /(?<=user:(\i),guildId:\i,channel:(\i).*?)BOOST_GEM_ICON\}\}\)\)\};/,
+                match: /(?<=user:(\i),guildId:\i,channel:(\i).*?)BOOST_GEM_ICON.{0,10}\);/,
                 replace: "$&if($self.shouldHideUser($1.id, $2.id)) return null; "
             }
         },
diff --git a/src/equicordplugins/customTimestamps/index.tsx b/src/equicordplugins/customTimestamps/index.tsx
index 87930f6a..d90defe3 100644
--- a/src/equicordplugins/customTimestamps/index.tsx
+++ b/src/equicordplugins/customTimestamps/index.tsx
@@ -71,11 +71,11 @@ export default definePlugin({
             find: "#{intl::MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL}",
             replacement: [
                 {
-                    match: /(?<=\i=null!=\i\?).{0,25}\((\i),"LT"\):\(0,\i\.\i\)\(\i,!0\)/,
+                    match: /(?<=null!=\i\?).{0,25}\((\i),"LT"\):\(0,\i\.\i\)\(\i,!0\)/,
                     replace: '$self.format($1,"compactFormat","[calendar]"):$self.format($1,"cozyFormat","LT")',
                 },
                 {
-                    match: /(?<=text:)\(0,\i.\i\)\((\i),"LLLL"\)(?=,)/,
+                    match: /(?<=text:)\(\)=>\(0,\i.\i\)\((\i),"LLLL"\)(?=,)/,
                     replace: '$self.format($1,"tooltipFormat","LLLL")',
                 },
             ]
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index caa2a03a..b75d8659 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -112,7 +112,7 @@ export default definePlugin({
             predicate: () => settings.store.dmList,
         },
         {
-            find: "!1,wrapContent",
+            find: '"AvatarWithText"',
             replacement: [
                 {
                     match: /(\}=\i)/,
diff --git a/src/plugins/_api/memberListDecorators/index.tsx b/src/plugins/_api/memberListDecorators/index.tsx
index 39c82a1e..8bc80cb4 100644
--- a/src/plugins/_api/memberListDecorators/index.tsx
+++ b/src/plugins/_api/memberListDecorators/index.tsx
@@ -36,8 +36,8 @@ export default definePlugin({
                     match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
                     replace: "$&vencordProps=$1,"
                 }, {
-                    match: /#{intl::GUILD_OWNER}(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
-                    replace: "$&(typeof vencordProps=='undefined'?null:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
+                    match: /(?<=children:\[)(?=.{0,300},lostPermissionTooltipText:)/,
+                    replace: "(typeof vencordProps=='undefined'?null:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
                 }
             ]
         },
diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts
index 3d531459..8f8891e9 100644
--- a/src/plugins/ircColors/index.ts
+++ b/src/plugins/ircColors/index.ts
@@ -74,8 +74,8 @@ export default definePlugin({
         {
             find: "#{intl::GUILD_OWNER}),children:",
             replacement: {
-                match: /(typingIndicatorRef:.+?},)(\i=.+?)color:null!=.{0,50}?(?=,)/,
-                replace: (_, rest1, rest2) => `${rest1}ircColor=$self.calculateNameColorForListContext(arguments[0]),${rest2}color:ircColor`
+                match: /(?<=color:)null!=\i\?\i:void 0/,
+                replace: (_, rest1, rest2) => "$self.calculateNameColorForListContext(arguments[0])"
             },
             predicate: () => settings.store.memberListColors
         }
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index a2f846bb..2bf97e62 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -151,8 +151,8 @@ export const ApplicationAssetUtils = mapMangledModuleLazy("getAssetImage: size m
     getAssets: filters.byCode(".assets")
 });
 
-export const Clipboard: t.Clipboard = mapMangledModuleLazy('queryCommandEnabled("copy")', {
-    copy: filters.byCode(".copy("),
+export const Clipboard: t.Clipboard = mapMangledModuleLazy("await window.navigator.clipboard.writeText(", {
+    copy: filters.byCode(".writeText("),
     SUPPORTS_COPY: e => typeof e === "boolean"
 });