From c2e5dcc384a852fffc86d4098e12289fcc4aa0f5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 15 May 2025 19:54:09 -0300
Subject: [PATCH] Fix MessageLogger edit history & misc SHC patches

---
 src/plugins/messageLogger/index.tsx      |  8 ++++----
 src/plugins/showHiddenChannels/index.tsx | 17 ++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 25ee395e..3c7aecae 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -462,13 +462,13 @@ export default definePlugin({
             ]
         },
 
-        // Message content renderer
         {
+            // 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])),"
+                // Render editHistory behind the message content
+                match: /\.isFailed]:.+?children:\[/,
+                replace: "$&arguments[0]?.message?.editHistory?.length>0&&$self.renderEdits(arguments[0]),"
             }
         },
 
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 7a3dd9fb..95dee8fd 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -356,15 +356,10 @@ export default definePlugin({
             find: "#{intl::CHANNEL_CALL_CURRENT_SPEAKER}",
             replacement: [
                 {
-                    // Remove the divider and the open chat button for the HiddenChannelLockScreen
-                    match: /"more-options-popout"\)\),(?<=channel:(\i).+?inCall:(\i).+?)/,
-                    replace: (m, channel, inCall) => `${m}${inCall}||!$self.isHiddenChannel(${channel},true)&&`
-                },
-                {
-                    // Remove invite users button for the HiddenChannelLockScreen
-                    match: /"popup".{0,100}?if\((?<=channel:(\i).+?inCall:(\i).+?)/,
-                    replace: (m, channel, inCall) => `${m}(${inCall}||!$self.isHiddenChannel(${channel},true))&&`
-                },
+                    // Remove the open chat button for the HiddenChannelLockScreen
+                    match: /(?<=&&)\i\.push\(.{0,120}"chat-spacer"/,
+                    replace: "(arguments[0]?.inCall||!$self.isHiddenChannel(arguments[0]?.channel,true))&&$&"
+                }
             ]
         },
         {
@@ -427,8 +422,8 @@ export default definePlugin({
                 },
                 {
                     // Remove the open chat button for the HiddenChannelLockScreen
-                    match: /"recents".+?&&(?=\(.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
-                    replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
+                    match: /(?<=&&)\(0,\i\.jsxs?\).{0,180}\.buttonIcon/,
+                    replace: "!$self.isHiddenChannel(arguments[0]?.channel,true)&&$&"
                 }
             ]
         },