From d77fd04a6416fd07f12d248a2a8658bbdae59209 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 14 Feb 2025 21:22:01 -0500
Subject: [PATCH] Fixes For Canary

---
 src/equicordplugins/betterInvites/index.tsx    |  5 +++--
 src/equicordplugins/customUserColors/index.tsx | 12 +++++++-----
 src/equicordplugins/whosWatching/index.tsx     |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/equicordplugins/betterInvites/index.tsx b/src/equicordplugins/betterInvites/index.tsx
index a2c650ba..d72cbb74 100644
--- a/src/equicordplugins/betterInvites/index.tsx
+++ b/src/equicordplugins/betterInvites/index.tsx
@@ -44,8 +44,8 @@ export default definePlugin({
                     replace: ",($1||((!$1)&&arguments[0].invite.expires_at)) && $2$self.RenderTip($1, $3, arguments[0].invite.expires_at)"
                 },
                 {
-                    match: /(\.jsx\)\(\i.\i.Info,{.+onClick):(\i\?\i:null),/,
-                    replace: "$1:$2 || $self.Lurkable(arguments[0].invite.guild.id, arguments[0].invite.guild.features),"
+                    match: /(\.jsx\)\(\i.\i.Info,{.+onClick:\i\?.{0,5}:null)/,
+                    replace: "$& || $self.Lurkable(arguments[0].invite.guild.id, arguments[0].invite.guild.features)"
                 },
                 {
                     match: /(\.jsx\)\(\i\.\i\.Header,\{)text:(\i)/,
@@ -61,6 +61,7 @@ export default definePlugin({
         return <div className="vc-bi-header-inner">
             {(inviter && (currentUserId !== inviter.id)) ? <>
                 <img
+                    alt=""
                     className={classes(AvatarStyles.avatar, AvatarStyles.clickable) + " vc-bi-inviter-avatar"}
                     onClick={() => openUserProfile(inviter.id)}
                     src={inviter.avatar ? `https://cdn.discordapp.com/avatars/${inviter.id}/${inviter.avatar}.webp?size=80` : "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index e99d1e5a..24b51d12 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -8,7 +8,7 @@ import "./styles.css";
 
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { get } from "@api/DataStore";
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings, Settings } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import { openModal } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
@@ -57,7 +57,7 @@ export function getCustomColorString(userId: string, withHash?: boolean): string
 }
 
 const settings = definePluginSettings({
-    DmList: {
+    dmList: {
         type: OptionType.BOOLEAN,
         description: "Users with custom colors defined will have their name in the dm list colored",
         default: true,
@@ -69,8 +69,10 @@ const settings = definePluginSettings({
     }
 });
 
+
+migratePluginSettings("CustomUserColors", "customUserColors");
 export default definePlugin({
-    name: "customUserColors",
+    name: "CustomUserColors",
     description: "Lets you add a custom color to any user, anywhere! Highly recommend to use with typingTweaks and roleColorEverywhere",
     authors: [EquicordDevs.mochienya],
     contextMenus: { "user-context": userContextMenuPatch },
@@ -83,12 +85,12 @@ export default definePlugin({
             // this also affects name headers in chats outside of servers
             find: /type:\i\.\i\.Types\.REMIX/,
             replacement: {
-                match: /style:"username".*?void 0/,
+                match: /style:"username".{0,50}void 0/,
                 replace: "style:{color:$self.colorIfServer(arguments[0])}"
             }
         },
         {
-            predicate: () => settings.store.DmList,
+            predicate: () => settings.store.dmList,
             find: /muted:\i=!1,highlighted:\i=!1/,
             replacement: {
                 match: /(nameAndDecorators,)/,
diff --git a/src/equicordplugins/whosWatching/index.tsx b/src/equicordplugins/whosWatching/index.tsx
index 6755c66e..33a13a11 100644
--- a/src/equicordplugins/whosWatching/index.tsx
+++ b/src/equicordplugins/whosWatching/index.tsx
@@ -51,7 +51,7 @@ function Watching({ userIds, guildId }: WatchingProps): JSX.Element {
                     <Flex flexDirection="column" style={{ gap: 6 }} >
                         {users.map(user => (
                             <Flex key={user.id} flexDirection="row" style={{ gap: 6, alignContent: "center" }} className={cl("user")} >
-                                <img src={user.getAvatarURL(guildId)} style={{ borderRadius: 8, width: 16, height: 16 }} />
+                                <img src={user.getAvatarURL(guildId)} style={{ borderRadius: 8, width: 16, height: 16 }} alt="" />
                                 {getUsername(user)}
                             </Flex>
                         ))}