Merge pull request #1012 from apa420/apa-deleted-messages

Added support for single deleted messages

src/providers/twitch/IrcMessageHandler.cpp

@@ -266,6 +266,41 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
     }
 }
 
+void IrcMessageHandler::handleClearMessageMessage(Communi::IrcMessage *message)
+{
+    // check parameter count
+    if (message->parameters().length() < 1)
+    {
+        return;
+    }
+
+    QString chanName;
+    if (!trimChannelName(message->parameter(0), chanName))
+    {
+        return;
+    }
+
+    auto app = getApp();
+
+    // get channel
+    auto chan = app->twitch.server->getChannelOrEmpty(chanName);
+
+    if (chan->isEmpty())
+    {
+        log("[IrcMessageHandler:handleClearMessageMessage] Twitch channel {} "
+            "not "
+            "found",
+            chanName);
+        return;
+    }
+
+    auto tags = message->tags();
+
+    QString targetID = tags.value("target-msg-id").toString();
+
+    chan->deleteMessage(targetID);
+}
+
 void IrcMessageHandler::handleUserStateMessage(Communi::IrcMessage *message)
 {
     auto app = getApp();
@@ -516,7 +551,17 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
             return;
         }
 
-        channel->addMessage(msg);
+        QString tags = message->tags().value("msg-id", "").toString();
+        if (tags == "bad_delete_message_error" || tags == "usage_delete")
+        {
+            channel->addMessage(makeSystemMessage(
+                "Usage: \"/delete <msg-id>\" - can't take more "
+                "than one argument"));
+        }
+        else
+        {
+            channel->addMessage(msg);
+        }
     }
 }
 

src/providers/twitch/IrcMessageHandler.hpp

@@ -27,6 +27,7 @@ public:
 
     void handleRoomStateMessage(Communi::IrcMessage *message);
     void handleClearChatMessage(Communi::IrcMessage *message);
+    void handleClearMessageMessage(Communi::IrcMessage *message);
     void handleUserStateMessage(Communi::IrcMessage *message);
     void handleWhisperMessage(Communi::IrcMessage *message);
 

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -580,7 +580,7 @@ void TwitchMessageBuilder::parseMessageID()
 
     if (iterator != this->tags.end())
     {
-        this->messageID = iterator.value().toString();
+        this->message().id = iterator.value().toString();
     }
 }
 
@@ -607,7 +607,7 @@ void TwitchMessageBuilder::parseRoomID()
 void TwitchMessageBuilder::appendChannelName()
 {
     QString channelName("#" + this->channel->getName());
-    Link link(Link::Url, this->channel->getName() + "\n" + this->messageID);
+    Link link(Link::Url, this->channel->getName() + "\n" + this->message().id);
 
     this->emplace<TextElement>(channelName, MessageElementFlag::ChannelName,
                                MessageColor::System)  //

src/providers/twitch/TwitchMessageBuilder.hpp

@@ -41,7 +41,6 @@ public:
     MessageParseArgs args;
     const QVariantMap tags;
 
-    QString messageID;
     QString userName;
 
     bool isIgnored() const;
@@ -55,8 +54,10 @@ private:
     void appendUsername();
     void parseHighlights(bool isPastMsg);
 
-    void appendTwitchEmote(const QString &emote,
-        std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec, std::vector<int> &correctPositions);
+    void appendTwitchEmote(
+        const QString &emote,
+        std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec,
+        std::vector<int> &correctPositions);
     Outcome tryAppendEmote(const EmoteName &name);
 
     void addWords(

src/providers/twitch/TwitchServer.cpp

@@ -156,6 +156,10 @@ void TwitchServer::messageReceived(Communi::IrcMessage *message)
     {
         handler.handleClearChatMessage(message);
     }
+    else if (command == "CLEARMSG")
+    {
+        handler.handleClearMessageMessage(message);
+    }
     else if (command == "USERSTATE")
     {
         handler.handleUserStateMessage(message);