From 98b1b11dfa8728318160b309ecad6daef9589c7e Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 13 May 2025 20:59:13 -0300
Subject: [PATCH] Fix NoServerEmojis, InvisibleChat & other patches

---
 src/plugins/invisibleChat.desktop/index.tsx |  2 +-
 src/plugins/messageLogger/index.tsx         | 28 +++++++++++----------
 src/plugins/noServerEmojis/index.ts         |  2 +-
 src/plugins/roleColorEverywhere/index.tsx   |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index f5e8cbb5..ab124192 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -110,7 +110,7 @@ export default definePlugin({
     patches: [
         {
             // Indicator
-            find: "#{intl::MESSAGE_EDITED}",
+            find: ".SEND_FAILED,",
             replacement: {
                 match: /let\{className:\i,message:\i[^}]*\}=(\i)/,
                 replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ffe5286e..25ee395e 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -462,21 +462,23 @@ export default definePlugin({
             ]
         },
 
+        // Message content renderer
+        {
+            find: ".SEND_FAILED,",
+            replacement: {
+                // Render editHistory in the deepest div for message content
+                match: /(\)\("div",\{id:.+?children:\[)/,
+                replace: "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),"
+            }
+        },
+
         {
-            // Message content renderer
             find: "#{intl::MESSAGE_EDITED}",
-            replacement: [
-                {
-                    // Render editHistory in the deepest div for message content
-                    match: /(\)\("div",\{id:.+?children:\[)/,
-                    replace: "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),"
-                },
-                {
-                    // Make edit marker clickable
-                    match: /"span",\{(?=className:\i\.edited,)/,
-                    replace: "$self.EditMarker,{message:arguments[0].message,"
-                }
-            ]
+            replacement: {
+                // Make edit marker clickable
+                match: /"span",\{(?=className:\i\.edited,)/,
+                replace: "$self.EditMarker,{message:arguments[0].message,"
+            }
         },
 
         {
diff --git a/src/plugins/noServerEmojis/index.ts b/src/plugins/noServerEmojis/index.ts
index 6a39f55c..cd950b42 100644
--- a/src/plugins/noServerEmojis/index.ts
+++ b/src/plugins/noServerEmojis/index.ts
@@ -30,7 +30,7 @@ export default definePlugin({
         {
             find: "}searchWithoutFetchingLatest(",
             replacement: {
-                match: /searchWithoutFetchingLatest.{20,300}get\((\i).{10,40}?reduce\(\((\i),(\i)\)=>\{/,
+                match: /\.get\((\i)\)\.nameMatchesChain\(\i\)\.reduce\(\((\i),(\i)\)=>\{/,
                 replace: "$& if ($self.shouldSkip($1, $3)) return $2;"
             }
         }
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 71f87b13..dc60bb64 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -153,7 +153,7 @@ export default definePlugin({
         },
         // Messages
         {
-            find: "#{intl::MESSAGE_EDITED}",
+            find: ".SEND_FAILED,",
             replacement: {
                 match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
                 replace: "style:$self.useMessageColorsStyle($1),"