From 2d7f515e5acef8e4ff5fe12405b27f10f9ea6b1a Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:35:33 +0000
Subject: [PATCH] fix: disable correct message upon automod approve or deny
 (#5611)

---
 CHANGELOG.md                             | 1 +
 src/messages/MessageBuilder.cpp          | 1 +
 src/providers/twitch/TwitchIrcServer.cpp | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e628a5fb..d35bfb744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - Bugfix: Fixed log files being locked longer than needed. (#5592)
 - Bugfix: Fixed global badges not showing in anonymous mode. (#5599)
 - Bugfix: Fixed grammar in the user highlight page. (#5602)
+- Bugfix: Fixed incorrect message being disabled in some cases upon approving or denying an automod caught message. (#5611)
 - Bugfix: Fixed double-click selection not working when clicking outside a message. (#5617)
 - Dev: Update Windows build from Qt 6.5.0 to Qt 6.7.1. (#5420)
 - Dev: Update vcpkg build Qt from 6.5.0 to 6.7.0, boost from 1.83.0 to 1.85.0, openssl from 3.1.3 to 3.3.0. (#5422)
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index c391b3d32..168f1eb67 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -1835,6 +1835,7 @@ std::pair<MessagePtr, MessagePtr> MessageBuilder::makeAutomodMessage(
 
     //
     // Builder for AutoMod message with explanation
+    builder.message().id = "automod_" + action.msgID;
     builder.message().loginName = "automod";
     builder.message().channelName = channelName;
     builder.message().flags.set(MessageFlag::PubSub);
diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp
index c6541a95c..9ca93f6fd 100644
--- a/src/providers/twitch/TwitchIrcServer.cpp
+++ b/src/providers/twitch/TwitchIrcServer.cpp
@@ -580,8 +580,12 @@ void TwitchIrcServer::initialize()
                             }
                         });
                     }
-                    // "ALLOWED" and "DENIED" statuses remain unimplemented
-                    // They are versions of automod_message_(denied|approved) but for mods.
+                    else
+                    {
+                        // Gray out approve/deny button upon "ALLOWED" and "DENIED" statuses
+                        // They are versions of automod_message_(denied|approved) but for mods.
+                        chan->deleteMessage("automod_" + msg.messageID);
+                    }
                 }
                 break;
 
@@ -629,7 +633,6 @@ void TwitchIrcServer::initialize()
             postToThread([chan, msg] {
                 chan->addMessage(msg, MessageContext::Original);
             });
-            chan->deleteMessage(msg->id);
         });
 
     this->connections_.managedConnect(