From 26bf65e5d9dbf5d56e215116b4d4a76496c63f3f Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:42:43 -0400
Subject: [PATCH] CustomUserColors: Fix Patch

---
 src/equicordplugins/betterplusreacts/index.ts  | 5 ++---
 src/equicordplugins/customUserColors/index.tsx | 2 +-
 src/webpack/common/stores.ts                   | 6 +-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/equicordplugins/betterplusreacts/index.ts b/src/equicordplugins/betterplusreacts/index.ts
index 5426dbcba..a590b0263 100644
--- a/src/equicordplugins/betterplusreacts/index.ts
+++ b/src/equicordplugins/betterplusreacts/index.ts
@@ -7,9 +7,7 @@
 // https://github.com/Masterjoona/vc-betterplusreacts/blob/main/index.ts
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-
-const { getMessages } = findByPropsLazy("getMessages");
+import { MessageStore } from "@webpack/common";
 
 export default definePlugin({
     name: "BetterPlusReacts",
@@ -56,6 +54,7 @@ export default definePlugin({
         return message;
     },
     setMsgReference(plusses: string, channelId: string) {
+        const { getMessages } = MessageStore;
         this.message = getMessages(channelId).getByIndex(getMessages(channelId).length - plusses.split("+").length + 1);
     }
 });
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index 366c21305..4e123e829 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -127,7 +127,7 @@ export default definePlugin({
         {
             find: '"Reply Chain Nudge")',
             replacement: {
-                match: /(,color:)(\i),/,
+                match: /(,colorString:)(\i),/,
                 replace: "$1$self.colorInReplyingTo(arguments[0]) ?? $2,",
             },
         },
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index dede22db8..0af91b816 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -17,7 +17,7 @@
 */
 
 import * as t from "@vencord/discord-types";
-import { findByCodeLazy, findByPropsLazy, waitFor } from "@webpack";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
 
 import { waitForStore } from "./internal";
 
@@ -86,7 +86,3 @@ waitForStore("ThemeStore", m => {
     Vencord.QuickCss.initQuickCssThemeStore();
 });
 waitForStore("VoiceStateStore", m => VoiceStateStore = m);
-
-// GuildRoleStore is new, this code is for stable + canary compatibility
-// TODO: Change to waitForStore once GuildRoleStore is on stable
-waitFor(["getRole", "getRoles"], m => GuildRoleStore = m);