feat: allow timeout-related commands to be used in multiple channels

.gitmodules

@@ -41,3 +41,6 @@
 [submodule "tools/crash-handler"]
 	path = tools/crash-handler
 	url = https://github.com/Chatterino/crash-handler
+[submodule "lib/expected-lite"]
+	path = lib/expected-lite
+	url = https://github.com/martinmoene/expected-lite

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Minor: Add option to customise Moderation buttons with images. (#5369)
 - Minor: Colored usernames now update on the fly when changing the "Color @usernames" setting. (#5300)
 - Minor: Added `flags.action` filter variable, allowing you to filter on `/me` messages. (#5397)
+- Minor: Added the ability for `/ban`, `/timeout`, `/unban`, and `/untimeout` to specify multiple channels to duplicate the action to. Example: `/timeout --channel id:11148817 --channel testaccount_420 forsen 7m game complaining`. (#5402)
 - Minor: The size of the emote popup is now saved. (#5415)
 - Minor: Added the ability to duplicate tabs. (#5277)
 - Minor: Improved error messages for channel update commands. (#5429)

benchmarks/src/RecentMessages.cpp

@@ -4,6 +4,7 @@
 #include "messages/Emote.hpp"
 #include "mocks/DisabledStreamerMode.hpp"
 #include "mocks/EmptyApplication.hpp"
+#include "mocks/LinkResolver.hpp"
 #include "mocks/TwitchIrcServer.hpp"
 #include "mocks/UserData.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
@@ -99,10 +100,16 @@ class MockApplication : mock::EmptyApplication
         return &this->streamerMode;
     }
 
+    ILinkResolver *getLinkResolver() override
+    {
+        return &this->linkResolver;
+    }
+
     AccountController accounts;
     Emotes emotes;
     mock::UserDataController userData;
     mock::MockTwitchIrcServer twitch;
+    mock::EmptyLinkResolver linkResolver;
     ChatterinoBadges chatterinoBadges;
     FfzBadges ffzBadges;
     SeventvBadges seventvBadges;

mocks/include/mocks/EmptyApplication.hpp

@@ -19,6 +19,11 @@ class EmptyApplication : public IApplication
 
     virtual ~EmptyApplication() = default;
 
+    bool isTest() const override
+    {
+        return true;
+    }
+
     const Paths &getPaths() override
     {
         return this->paths_;
@@ -137,7 +142,7 @@ class EmptyApplication : public IApplication
         return nullptr;
     }
 
-    Logging *getChatLogger() override
+    ILogging *getChatLogger() override
     {
         assert(!"getChatLogger was called without being initialized");
         return nullptr;

mocks/include/mocks/LinkResolver.hpp

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "providers/links/LinkResolver.hpp"
+
+#include <gmock/gmock.h>
+#include <QString>
+#include <QStringList>
+
+namespace chatterino::mock {
+
+class LinkResolver : public ILinkResolver
+{
+public:
+    LinkResolver() = default;
+    ~LinkResolver() override = default;
+
+    MOCK_METHOD(void, resolve, (LinkInfo * info), (override));
+};
+
+class EmptyLinkResolver : public ILinkResolver
+{
+public:
+    EmptyLinkResolver() = default;
+    ~EmptyLinkResolver() override = default;
+
+    void resolve(LinkInfo *info) override
+    {
+        //
+    }
+};
+
+}  // namespace chatterino::mock

mocks/include/mocks/Logging.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "singletons/Logging.hpp"
+
+#include <gmock/gmock.h>
+#include <QString>
+#include <QStringList>
+
+namespace chatterino::mock {
+
+class Logging : public ILogging
+{
+public:
+    Logging() = default;
+    ~Logging() override = default;
+
+    MOCK_METHOD(void, addMessage,
+                (const QString &channelName, MessagePtr message,
+                 const QString &platformName),
+                (override));
+};
+
+class EmptyLogging : public ILogging
+{
+public:
+    EmptyLogging() = default;
+    ~EmptyLogging() override = default;
+
+    void addMessage(const QString &channelName, MessagePtr message,
+                    const QString &platformName) override
+    {
+        //
+    }
+};
+
+}  // namespace chatterino::mock

resources/licenses/expected-lite.txt

@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

src/Application.cpp

@@ -504,7 +504,7 @@ PubSub *Application::getTwitchPubSub()
     return this->twitchPubSub.get();
 }
 
-Logging *Application::getChatLogger()
+ILogging *Application::getChatLogger()
 {
     assertInGuiThread();
 

src/Application.hpp

@@ -35,6 +35,7 @@ class PluginController;
 
 class Theme;
 class WindowManager;
+class ILogging;
 class Logging;
 class Paths;
 class Emotes;
@@ -64,6 +65,8 @@ class IApplication
 
     static IApplication *instance;
 
+    virtual bool isTest() const = 0;
+
     virtual const Paths &getPaths() = 0;
     virtual const Args &getArgs() = 0;
     virtual Theme *getThemes() = 0;
@@ -80,7 +83,7 @@ class IApplication
     virtual ITwitchIrcServer *getTwitch() = 0;
     virtual IAbstractIrcServer *getTwitchAbstract() = 0;
     virtual PubSub *getTwitchPubSub() = 0;
-    virtual Logging *getChatLogger() = 0;
+    virtual ILogging *getChatLogger() = 0;
     virtual IChatterinoBadges *getChatterinoBadges() = 0;
     virtual FfzBadges *getFfzBadges() = 0;
     virtual SeventvBadges *getSeventvBadges() = 0;
@@ -121,6 +124,11 @@ class Application : public IApplication
     Application &operator=(const Application &) = delete;
     Application &operator=(Application &&) = delete;
 
+    bool isTest() const override
+    {
+        return false;
+    }
+
     /**
      * In the interim, before we remove _exit(0); from RunGui.cpp,
      * this will destroy things we know can be destroyed
@@ -191,7 +199,7 @@ class Application : public IApplication
     ITwitchIrcServer *getTwitch() override;
     IAbstractIrcServer *getTwitchAbstract() override;
     PubSub *getTwitchPubSub() override;
-    Logging *getChatLogger() override;
+    ILogging *getChatLogger() override;
     FfzBadges *getFfzBadges() override;
     SeventvBadges *getSeventvBadges() override;
     IUserDataController *getUserData() override;

src/CMakeLists.txt

@@ -107,6 +107,8 @@ set(SOURCE_FILES
         controllers/commands/builtin/twitch/UpdateChannel.hpp
         controllers/commands/builtin/twitch/UpdateColor.cpp
         controllers/commands/builtin/twitch/UpdateColor.hpp
+        controllers/commands/common/ChannelAction.cpp
+        controllers/commands/common/ChannelAction.hpp
         controllers/commands/CommandContext.hpp
         controllers/commands/CommandController.cpp
         controllers/commands/CommandController.hpp
@@ -1003,6 +1005,9 @@ target_include_directories(${LIBRARY_PROJECT} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 # semver dependency https://github.com/Neargye/semver
 target_include_directories(${LIBRARY_PROJECT} PUBLIC ${CMAKE_SOURCE_DIR}/lib/semver/include)
 
+# expected-lite dependency https://github.com/martinmoene/expected-lite
+target_include_directories(${LIBRARY_PROJECT} PUBLIC ${CMAKE_SOURCE_DIR}/lib/expected-lite/include)
+
 # miniaudio dependency https://github.com/mackron/miniaudio
 if (USE_SYSTEM_MINIAUDIO)
     message(STATUS "Building with system miniaudio")

src/common/QLogging.cpp

@@ -11,6 +11,7 @@ Q_LOGGING_CATEGORY(chatterinoArgs, "chatterino.args", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoBenchmark, "chatterino.benchmark", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoBttv, "chatterino.bttv", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoCache, "chatterino.cache", logThreshold);
+Q_LOGGING_CATEGORY(chatterinoCommands, "chatterino.commands", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoCommon, "chatterino.common", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoCrashhandler, "chatterino.crashhandler",
                    logThreshold);

src/common/QLogging.hpp

@@ -7,6 +7,7 @@ Q_DECLARE_LOGGING_CATEGORY(chatterinoArgs);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoBenchmark);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoBttv);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoCache);
+Q_DECLARE_LOGGING_CATEGORY(chatterinoCommands);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoCommon);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoCrashhandler);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoEmoji);
@@ -17,6 +18,7 @@ Q_DECLARE_LOGGING_CATEGORY(chatterinoHighlights);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoHotkeys);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoHTTP);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoImage);
+Q_DECLARE_LOGGING_CATEGORY(chatterinoImageuploader);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoIrc);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoIvr);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoLiveupdates);
@@ -26,7 +28,6 @@ Q_DECLARE_LOGGING_CATEGORY(chatterinoMessage);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoNativeMessage);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoNetwork);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoNotification);
-Q_DECLARE_LOGGING_CATEGORY(chatterinoImageuploader);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoPubSub);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoRecentMessages);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoSettings);