From 5f8c0c0f0e01af188d77d80c6456da429ffe8cc1 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:29:37 -0400
Subject: [PATCH] Merge

---
 .github/workflows/build.yml                    | 2 +-
 scripts/generateEquicordPluginList.ts          | 4 ++--
 src/equicordplugins/customUserColors/index.tsx | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0a7fcd74..6a1c8ee88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
                   cp desktop/* release
                   for file in equibop/*; do
                     filename=$(basename "$file")
-                    cp "$file" "release/equicordDesktop${filename^}"
+                    cp "$file" "release/equibop${filename^}"
                   done
 
                   find release -size 0 -delete
diff --git a/scripts/generateEquicordPluginList.ts b/scripts/generateEquicordPluginList.ts
index 2a349f586..6fbd61bf5 100644
--- a/scripts/generateEquicordPluginList.ts
+++ b/scripts/generateEquicordPluginList.ts
@@ -45,7 +45,7 @@ interface PluginData {
     commands: Command[];
     required: boolean;
     enabledByDefault: boolean;
-    target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "desktop" | "web" | "dev";
+    target: "discordDesktop" | "vencordDesktop" | "equibop" | "desktop" | "web" | "dev";
     filePath: string;
 }
 
@@ -215,7 +215,7 @@ async function parseFile(fileName: string) {
 
         const target = getPluginTarget(fileName);
         if (target) {
-            if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
+            if (!["web", "discordDesktop", "vencordDesktop", "equibop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
             data.target = target as any;
         }
 
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index 9e825152a..be141df39 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -83,8 +83,8 @@ export default definePlugin({
             // this also affects name headers in chats outside of servers
             find: '="SYSTEM_TAG"',
             replacement: {
-                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0\}\)\(\),)/,
-                replace: "style:{color:$self.colorIfServer(arguments[0])},"
+                match: /\i.gradientClassName]\),style:/,
+                replace: "$&{color:$self.colorIfServer(arguments[0])},_style:"
             },
             predicate: () => !Settings.plugins.IrcColors.enabled
         },