From 2d803c84dbe833c17cb615c7eaf4e9a6c84fd870 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 3 Oct 2025 12:15:20 -0400
Subject: [PATCH] MessageClickActions: Try To Fix Random Actions

---
 src/plugins/messageClickActions/index.ts | 63 +++++++++++++-----------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 148998f8e..7ccc36f61 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -76,36 +76,10 @@ export default definePlugin({
 
     onMessageClick(msg, channel, event) {
         const isMe = msg.author.id === UserStore.getCurrentUser().id;
-        if (!isDeletePressed) {
-            if (event.detail < 2) return;
-            if (settings.store.requireModifier && !event.ctrlKey && !event.shiftKey) return;
-            if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
-            if (msg.deleted === true) return;
 
-            if (isMe) {
-                if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id) || msg.state !== "SENT") return;
+        if (isDeletePressed) {
+            if (!settings.store.enableDeleteOnClick || !(isMe || PermissionStore.can(PermissionsBits.MANAGE_MESSAGES, channel))) return;
 
-                MessageActions.startEditMessage(channel.id, msg.id, msg.content);
-                event.preventDefault();
-            } else {
-                if (!settings.store.enableDoubleClickToReply) return;
-
-                if (!MessageTypeSets.REPLYABLE.has(msg.type) || msg.hasFlag(MessageFlags.EPHEMERAL)) return;
-
-                const isShiftPress = event.shiftKey && !settings.store.requireModifier;
-                const shouldMention = Vencord.Plugins.isPluginEnabled(NoReplyMentionPlugin.name)
-                    ? NoReplyMentionPlugin.shouldMention(msg, isShiftPress)
-                    : !isShiftPress;
-
-                FluxDispatcher.dispatch({
-                    type: "CREATE_PENDING_REPLY",
-                    channel,
-                    message: msg,
-                    shouldMention,
-                    showMentionToggle: channel.guild_id !== null
-                });
-            }
-        } else if (settings.store.enableDeleteOnClick && (isMe || PermissionStore.can(PermissionsBits.MANAGE_MESSAGES, channel))) {
             if (msg.deleted) {
                 FluxDispatcher.dispatch({
                     type: "MESSAGE_DELETE",
@@ -116,7 +90,40 @@ export default definePlugin({
             } else {
                 MessageActions.deleteMessage(channel.id, msg.id);
             }
+
             event.preventDefault();
+            return;
+        }
+
+        if (event.detail !== 2) return;
+        if (settings.store.requireModifier && !event.ctrlKey && !event.shiftKey) return;
+        if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
+        if (msg.deleted === true) return;
+
+        if (isMe) {
+            if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id) || msg.state !== "SENT") return;
+
+            MessageActions.startEditMessage(channel.id, msg.id, msg.content);
+            event.preventDefault();
+            return;
+        } else {
+            if (!settings.store.enableDoubleClickToReply) return;
+            if (!MessageTypeSets.REPLYABLE.has(msg.type) || msg.hasFlag(MessageFlags.EPHEMERAL)) return;
+
+            const isShiftPress = event.shiftKey && !settings.store.requireModifier;
+            const shouldMention = Vencord.Plugins.isPluginEnabled(NoReplyMentionPlugin.name)
+                ? NoReplyMentionPlugin.shouldMention(msg, isShiftPress)
+                : !isShiftPress;
+
+            FluxDispatcher.dispatch({
+                type: "CREATE_PENDING_REPLY",
+                channel,
+                message: msg,
+                shouldMention,
+                showMentionToggle: channel.guild_id !== null
+            });
+            event.preventDefault();
+            return;
         }
     },
 });