Merge 56ba1ca2ee into 5b1ce32a4e

src/providers/seventv/SeventvEventAPI.cpp

@@ -237,6 +237,10 @@ void SeventvEventAPI::handleDispatch(const Dispatch &dispatch)
             // unhandled (not clear what we'd do here yet)
         }
         break;
+        case SubscriptionType::CreateEmoteSet: {
+            // unhandled (c2 does not support custom emote sets)
+        }
+        break;
         default: {
             qCDebug(chatterinoSeventvEventAPI)
                 << "Unknown subscription type:"

src/providers/twitch/TwitchIrcServer.cpp

@@ -33,7 +33,6 @@
 #include <pajlada/signals/signalholder.hpp>
 #include <QCoreApplication>
 #include <QMetaEnum>
-#include <QStringBuilder>
 
 #include <cassert>
 #include <functional>
@@ -149,6 +148,8 @@ bool shouldSendHelixChat()
 
 namespace chatterino {
 
+using namespace literals;
+
 TwitchIrcServer::TwitchIrcServer()
     : whispersChannel(new Channel("/whispers", Channel::Type::TwitchWhispers))
     , mentionsChannel(new Channel("/mentions", Channel::Type::TwitchMentions))
@@ -504,25 +505,22 @@ void TwitchIrcServer::initialize()
                                 if (hideBlockedTerms)
                                 {
                                     action.reason =
-                                        u"matched " %
+                                        u"matches %1 blocked term%2"_s
-                                        QString::number(
+                                            .arg(numBlockedTermsMatched)
-                                            numBlockedTermsMatched) %
+                                            .arg(numBlockedTermsMatched > 1
-                                        u" blocked term" %
+                                                     ? u"s"
-                                        (numBlockedTermsMatched > 1 ? u"s"
                                                      : u"");
                                 }
                                 else
                                 {
                                     action.reason =
-                                        u"matched " %
+                                        u"matches %1 blocked term%2 \"%3\""_s
-                                        QString::number(
+                                            .arg(numBlockedTermsMatched)
-                                            numBlockedTermsMatched) %
+                                            .arg(numBlockedTermsMatched > 1
-                                        u" blocked term" %
+                                                     ? u"s"
-                                        (numBlockedTermsMatched > 1 ? u"s"
+                                                     : u"")
-                                                                    : u"") %
+                                            .arg(msg.blockedTermsFound.join(
-                                        u": \"" %
+                                                u"\", \""));
-                                        msg.blockedTermsFound.join(u"\", \"") %
-                                        u"\"";
                                 }
                             }
                             else