From d5ecba3d3068b30eabcab2aac6e53484049585a1 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 14 Aug 2021 13:06:58 +0200
Subject: [PATCH] Rewrite logic for when to show moderation buttons next to
 messages (#2800)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 src/providers/twitch/TwitchMessageBuilder.cpp | 42 +++++++++----------
 src/providers/twitch/TwitchMessageBuilder.hpp |  2 +
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 97c36f0d7..f91f2f742 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -184,29 +184,7 @@ MessagePtr TwitchMessageBuilder::build()
     this->emplace<TimestampElement>(
         calculateMessageTimestamp(this->ircMessage));
 
-    bool addModerationElement = true;
-    if (this->senderIsBroadcaster)
-    {
-        addModerationElement = false;
-    }
-    else
-    {
-        bool hasUserType = this->tags.contains("user-type");
-        if (hasUserType)
-        {
-            QString userType = this->tags.value("user-type").toString();
-
-            if (userType == "mod")
-            {
-                if (!args.isStaffOrBroadcaster)
-                {
-                    addModerationElement = false;
-                }
-            }
-        }
-    }
-
-    if (addModerationElement)
+    if (this->shouldAddModerationElements())
     {
         this->emplace<TwitchModerationElement>();
     }
@@ -1230,6 +1208,24 @@ Outcome TwitchMessageBuilder::tryParseCheermote(const QString &string)
     return Success;
 }
 
+bool TwitchMessageBuilder::shouldAddModerationElements() const
+{
+    if (this->senderIsBroadcaster)
+    {
+        // You cannot timeout the broadcaster
+        return false;
+    }
+
+    if (this->tags.value("user-type").toString() == "mod" &&
+        !this->args.isStaffOrBroadcaster)
+    {
+        // You cannot timeout moderators UNLESS you are Twitch Staff or the broadcaster of the channel
+        return false;
+    }
+
+    return true;
+}
+
 void TwitchMessageBuilder::appendChannelPointRewardMessage(
     const ChannelPointReward &reward, MessageBuilder *builder, bool isMod,
     bool isBroadcaster)
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index 7cf68494a..8f1217c8e 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -90,6 +90,8 @@ private:
     void appendFfzBadges();
     Outcome tryParseCheermote(const QString &string);
 
+    bool shouldAddModerationElements() const;
+
     QString roomID_;
     bool hasBits_ = false;
     QString bits;