From 98a38642c744514dbbc9b22278ae35b5d11188b7 Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 Jan 2026 16:47:11 -0500
Subject: [PATCH] fix PetPet & RoleColorEverywhere, (#3893)

---
 packages/discord-types/src/modules/CloudUpload.d.ts | 3 +--
 src/plugins/implicitRelationships/index.ts          | 4 ++--
 src/plugins/roleColorEverywhere/index.tsx           | 4 ++--
 src/webpack/common/utils.ts                         | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/discord-types/src/modules/CloudUpload.d.ts b/packages/discord-types/src/modules/CloudUpload.d.ts
index 02192ed59..ecd525a5a 100644
--- a/packages/discord-types/src/modules/CloudUpload.d.ts
+++ b/packages/discord-types/src/modules/CloudUpload.d.ts
@@ -27,7 +27,7 @@ export interface WebUploadItem extends BaseUploadItem {
 export type CloudUploadItem = ReactNativeUploadItem | WebUploadItem;
 
 export class CloudUpload extends EventEmitter {
-    constructor(item: CloudUploadItem, channelId: string, showLargeMessageDialog?: boolean, reactNativeFileIndex?: number);
+    constructor(item: CloudUploadItem, channelId: string, reactNativeFileIndex?: number);
 
     channelId: string;
     classification: string;
@@ -56,7 +56,6 @@ export class CloudUpload extends EventEmitter {
     preCompressionSize: number;
     responseUrl: string;
     sensitive: boolean;
-    showLargeMessageDialog: boolean;
     spoiler: boolean;
     startTime: number;
     status: "NOT_STARTED" | "STARTED" | "UPLOADING" | "ERROR" | "COMPLETED" | "CANCELLED" | "REMOVED_FROM_MSG_DRAFT";
diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 8fe8873a4..d6b33f657 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -84,9 +84,9 @@ export default definePlugin({
 
         // Add support for the nonce parameter to Discord's shitcode
         {
-            find: ".REQUEST_GUILD_MEMBERS",
+            find: ".REQUEST_GUILD_MEMBERS,",
             replacement: {
-                match: /\.send\(8,{/,
+                match: /\.send\(\i\.\i\.REQUEST_GUILD_MEMBERS,{/,
                 replace: "$&nonce:arguments[1].nonce,"
             }
         },
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 9162bbc64..7d71444b9 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -105,8 +105,8 @@ export default definePlugin({
             find: 'tutorialId:"whos-online',
             replacement: [
                 {
-                    match: /null,\i," — ",\i\]/,
-                    replace: "null,$self.RoleGroupColor(arguments[0])]"
+                    match: /(?<=\.roleIcon.{0,15}:null,).{0,150}— ",\i\]\}\)\]/,
+                    replace: "$self.RoleGroupColor(arguments[0])]"
                 },
             ],
             predicate: () => settings.store.memberList
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index ed04bf958..c23a8e662 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -138,7 +138,7 @@ export const UserUtils = {
 
 export const UploadManager = findByPropsLazy("clearAll", "addFile");
 export const UploadHandler = {
-    promptToUpload: findByCodeLazy("=!0,showLargeMessageDialog:") as (files: File[], channel: t.Channel, draftType: Number) => void
+    promptToUpload: findByCodeLazy("Unexpected mismatch between files and file metadata") as (files: File[], channel: t.Channel, draftType: Number) => void
 };
 
 export const ApplicationAssetUtils = mapMangledModuleLazy("getAssetImage: size must === [", {