Merge remote-tracking branch 'upstream/master' into chatterino7

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Minor: Added `flags.action` filter variable, allowing you to filter on `/me` messages. (#5397)
 - Minor: The size of the emote popup is now saved. (#5415)
 - Minor: Added the ability to duplicate tabs. (#5277)
+- Minor: Moderators can now see when users are warned. (#5441)
 - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426)
 - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
 - Bugfix: Fixed restricted users usernames not being clickable. (#5405)

src/Application.cpp

@@ -691,6 +691,24 @@ void Application::initPubSub()
                 chan->addOrReplaceTimeout(msg.release());
             });
         });
+
+    std::ignore = this->twitchPubSub->moderation.userWarned.connect(
+        [&](const auto &action) {
+            auto chan = this->twitch->getChannelOrEmptyByID(action.roomID);
+
+            if (chan->isEmpty())
+            {
+                return;
+            }
+
+            // TODO: Resolve the moderator's user ID into a full user here, so message can look better
+            postToThread([chan, action] {
+                MessageBuilder msg(action);
+                msg->flags.set(MessageFlag::PubSub);
+                chan->addMessage(msg.release());
+            });
+        });
+
     std::ignore = this->twitchPubSub->moderation.messageDeleted.connect(
         [&](const auto &action) {
             auto chan = this->twitch->getChannelOrEmptyByID(action.roomID);

src/messages/MessageBuilder.cpp

@@ -323,6 +323,31 @@ MessageBuilder::MessageBuilder(const UnbanAction &action)
     this->message().searchText = text;
 }
 
+MessageBuilder::MessageBuilder(const WarnAction &action)
+    : MessageBuilder()
+{
+    this->emplace<TimestampElement>();
+    this->message().flags.set(MessageFlag::System);
+
+    QString text;
+
+    // TODO: Use MentionElement here, once WarnAction includes username/displayname
+    this->emplaceSystemTextAndUpdate("A moderator", text)
+        ->setLink({Link::UserInfo, "id:" + action.source.id});
+    this->emplaceSystemTextAndUpdate("warned", text);
+    this->emplaceSystemTextAndUpdate(
+            action.target.login + (action.reasons.isEmpty() ? "." : ":"), text)
+        ->setLink({Link::UserInfo, action.target.login});
+
+    if (!action.reasons.isEmpty())
+    {
+        this->emplaceSystemTextAndUpdate(action.reasons.join(", "), text);
+    }
+
+    this->message().messageText = text;
+    this->message().searchText = text;
+}
+
 MessageBuilder::MessageBuilder(const AutomodUserAction &action)
     : MessageBuilder()
 {

src/messages/MessageBuilder.hpp

@@ -12,6 +12,7 @@
 namespace chatterino {
 struct BanAction;
 struct UnbanAction;
+struct WarnAction;
 struct AutomodAction;
 struct AutomodUserAction;
 struct AutomodInfoAction;
@@ -78,6 +79,7 @@ class MessageBuilder
                    const QTime &time = QTime::currentTime());
     MessageBuilder(const BanAction &action, uint32_t count = 1);
     MessageBuilder(const UnbanAction &action);
+    MessageBuilder(const WarnAction &action);
     MessageBuilder(const AutomodUserAction &action);
 
     MessageBuilder(LiveUpdatesAddEmoteMessageTag, const QString &platform,

src/providers/twitch/PubSubActions.hpp

@@ -4,6 +4,7 @@
 #include <QDebug>
 #include <QJsonObject>
 #include <QString>
+#include <QStringList>
 
 #include <chrono>
 #include <cinttypes>
@@ -171,4 +172,12 @@ struct AutomodInfoAction : PubSubAction {
     } type;
 };
 
+struct WarnAction : PubSubAction {
+    using PubSubAction::PubSubAction;
+
+    ActionUser target;
+
+    QStringList reasons;
+};
+
 }  // namespace chatterino

src/providers/twitch/PubSubManager.cpp

@@ -286,6 +286,37 @@ PubSub::PubSub(const QString &host, std::chrono::seconds pingInterval)
         this->moderation.userUnbanned.invoke(action);
     };
 
+    this->moderationActionHandlers["warn"] = [this](const auto &data,
+                                                    const auto &roomID) {
+        WarnAction action(data, roomID);
+
+        action.source.id = data.value("created_by_user_id").toString();
+        action.source.login =
+            data.value("created_by").toString();  // currently always empty
+
+        action.target.id = data.value("target_user_id").toString();
+        action.target.login = data.value("target_user_login").toString();
+
+        const auto reasons = data.value("args").toArray();
+        bool firstArg = true;
+        for (const auto &reasonValue : reasons)
+        {
+            if (firstArg)
+            {
+                // Skip first arg in the reasons array since it's not a reason
+                firstArg = false;
+                continue;
+            }
+            const auto &reason = reasonValue.toString();
+            if (!reason.isEmpty())
+            {
+                action.reasons.append(reason);
+            }
+        }
+
+        this->moderation.userWarned.invoke(action);
+    };
+
     /*
     // This handler is no longer required as we use the automod-queue topic now
     this->moderationActionHandlers["automod_rejected"] =
@@ -1131,8 +1162,8 @@ void PubSub::handleMessageResponse(const PubSubMessageMessage &message)
 
             case PubSubChatModeratorActionMessage::Type::INVALID:
             default: {
-                qCDebug(chatterinoPubSub)
-                    << "Invalid whisper type:" << innerMessage.typeString;
+                qCDebug(chatterinoPubSub) << "Invalid moderator action type:"
+                                          << innerMessage.typeString;
             }
             break;
         }

src/providers/twitch/PubSubManager.hpp

@@ -34,6 +34,7 @@ struct PubSubAutoModQueueMessage;
 struct AutomodAction;
 struct AutomodUserAction;
 struct AutomodInfoAction;
+struct WarnAction;
 struct PubSubLowTrustUsersMessage;
 struct PubSubWhisperMessage;
 
@@ -97,6 +98,7 @@ class PubSub
 
         Signal<BanAction> userBanned;
         Signal<UnbanAction> userUnbanned;
+        Signal<WarnAction> userWarned;
 
         Signal<PubSubLowTrustUsersMessage> suspiciousMessageReceived;
         Signal<PubSubLowTrustUsersMessage> suspiciousTreatmentUpdated;