From 92ff9c1ca4dfb787178cdfdd1d4178ac113b9188 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 12 May 2025 20:38:58 -0300
Subject: [PATCH] Fix IrcColors for gradient roles and other patches

---
 src/plugins/consoleJanitor/index.tsx |  2 +-
 src/plugins/ircColors/index.ts       | 14 ++++++++++++--
 src/plugins/mutualGroupDMs/index.tsx |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/plugins/consoleJanitor/index.tsx b/src/plugins/consoleJanitor/index.tsx
index d32f525e..7ef7ec9c 100644
--- a/src/plugins/consoleJanitor/index.tsx
+++ b/src/plugins/consoleJanitor/index.tsx
@@ -197,7 +197,7 @@ export default definePlugin({
         },
         // Patches Discord generic logger function
         {
-            find: "Σ:",
+            find: '"file-only"!==',
             predicate: () => settings.store.disableLoggers,
             replacement: {
                 match: /(?<=&&)(?=console)/,
diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts
index d4f453a7..d543c995 100644
--- a/src/plugins/ircColors/index.ts
+++ b/src/plugins/ircColors/index.ts
@@ -66,8 +66,10 @@ export default definePlugin({
         {
             find: '="SYSTEM_TAG"',
             replacement: {
-                match: /(?<=\.username.{0,50}?)style:/,
-                replace: "style:{color:$self.calculateNameColorForMessageContext(arguments[0])},_style:"
+                // Override colorString with our custom color and disable gradients if applying the custom color.
+                match: /&&null!=\i\.secondaryColor,(?<=colorString:(\i).+?(\i)=.+?)/,
+                replace: (m, colorString, hasGradientColors) => `${m}` +
+                    `vcIrcColorsDummy=[${colorString},${hasGradientColors}]=$self.getMessageColorsVariables(arguments[0],${hasGradientColors}),`
             }
         },
         {
@@ -80,6 +82,13 @@ export default definePlugin({
         }
     ],
 
+    getMessageColorsVariables(context: any, hasGradientColors: boolean) {
+        const colorString = this.calculateNameColorForMessageContext(context);
+        const originalColorString = context?.author?.colorString;
+
+        return [colorString, hasGradientColors && colorString === originalColorString];
+    },
+
     calculateNameColorForMessageContext(context: any) {
         const userId: string | undefined = context?.message?.author?.id;
         const colorString = context?.author?.colorString;
@@ -97,6 +106,7 @@ export default definePlugin({
             ? color
             : colorString;
     },
+
     calculateNameColorForListContext(context: any) {
         const id = context?.user?.id;
         const colorString = context?.colorString;
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index d88e1ee0..e46824b4 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -126,8 +126,8 @@ export default definePlugin({
                 },
                 // Make the tab bar item text smaller so our tab can fit.
                 {
-                    match: /(\.tabBarItem.+?variant:)"heading-lg\/medium"/,
-                    replace: '$1"heading-sm/medium"'
+                    match: /(\.tabBarItem.+?variant:)"heading-md\/normal"/,
+                    replace: '$1"heading-sm/normal"'
                 }
             ]
         },