Remove experimental IRC support

CHANGELOG.md

@@ -24,6 +24,7 @@
 - Minor: Replying to a message will now display the message being replied to. (#4350, #5519)
 - Minor: Links can now have prefixes and suffixes such as parentheses. (#5486, #5515)
 - Minor: Added support for scrolling in splits with touchscreen panning gestures. (#5524)
+- Minor: Removed experimental IRC support. (#5547)
 - 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)

mocks/include/mocks/EmptyApplication.hpp

@@ -133,7 +133,7 @@ class EmptyApplication : public IApplication
         return nullptr;
     }
 
-    IAbstractIrcServer *getTwitchAbstract() override
+    ITwitchIrcServer *getTwitchAbstract() override
     {
         assert(false && "EmptyApplication::getTwitchAbstract was called "
                         "without being initialized");

mocks/include/mocks/TwitchIrcServer.hpp

@@ -26,6 +26,38 @@ class MockTwitchIrcServer : public ITwitchIrcServer
     {
     }
 
+    void connect() override
+    {
+    }
+
+    void sendRawMessage(const QString &rawMessage) override
+    {
+    }
+
+    ChannelPtr getOrAddChannel(const QString &dirtyChannelName) override
+    {
+        assert(false && "unimplemented getOrAddChannel in mock irc server");
+        return {};
+    }
+
+    ChannelPtr getChannelOrEmpty(const QString &dirtyChannelName) override
+    {
+        assert(false && "unimplemented getChannelOrEmpty in mock irc server");
+        return {};
+    }
+
+    void addFakeMessage(const QString &data) override
+    {
+    }
+
+    void addGlobalSystemMessage(const QString &messageText) override
+    {
+    }
+
+    void forEachChannel(std::function<void(ChannelPtr)> func) override
+    {
+    }
+
     void forEachChannelAndSpecialChannels(
         std::function<void(ChannelPtr)> func) override
     {

src/Application.cpp

@@ -14,7 +14,6 @@
 #include "controllers/sound/ISoundController.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/ffz/FfzEmotes.hpp"
-#include "providers/irc/AbstractIrcServer.hpp"
 #include "providers/links/LinkResolver.hpp"
 #include "providers/seventv/SeventvAPI.hpp"
 #include "providers/seventv/SeventvEmotes.hpp"
@@ -33,7 +32,6 @@
 #include "providers/bttv/BttvLiveUpdates.hpp"
 #include "providers/chatterino/ChatterinoBadges.hpp"
 #include "providers/ffz/FfzBadges.hpp"
-#include "providers/irc/Irc2.hpp"
 #include "providers/seventv/eventapi/Dispatch.hpp"
 #include "providers/seventv/eventapi/Subscription.hpp"
 #include "providers/seventv/SeventvBadges.hpp"
@@ -224,11 +222,6 @@ void Application::initialize(Settings &settings, const Paths &paths)
     if (!this->args_.isFramelessEmbed)
     {
         getSettings()->currentVersion.setValue(CHATTERINO_VERSION);
-
-        if (getSettings()->enableExperimentalIrc)
-        {
-            Irc::instance().load();
-        }
     }
 
     this->accounts->load();
@@ -546,7 +539,7 @@ ITwitchIrcServer *Application::getTwitch()
     return this->twitch.get();
 }
 
-IAbstractIrcServer *Application::getTwitchAbstract()
+ITwitchIrcServer *Application::getTwitchAbstract()
 {
     assertInGuiThread();
 

src/Application.hpp

@@ -55,7 +55,6 @@ class SeventvEmotes;
 class SeventvEventAPI;
 class ILinkResolver;
 class IStreamerMode;
-class IAbstractIrcServer;
 
 class IApplication
 {
@@ -84,7 +83,7 @@ class IApplication
     virtual HighlightController *getHighlights() = 0;
     virtual NotificationController *getNotifications() = 0;
     virtual ITwitchIrcServer *getTwitch() = 0;
-    virtual IAbstractIrcServer *getTwitchAbstract() = 0;
+    virtual ITwitchIrcServer *getTwitchAbstract() = 0;
     virtual PubSub *getTwitchPubSub() = 0;
     virtual ILogging *getChatLogger() = 0;
     virtual IChatterinoBadges *getChatterinoBadges() = 0;
@@ -195,7 +194,8 @@ class Application : public IApplication
     NotificationController *getNotifications() override;
     HighlightController *getHighlights() override;
     ITwitchIrcServer *getTwitch() override;
-    IAbstractIrcServer *getTwitchAbstract() override;
+    [[deprecated("use getTwitch()")]] ITwitchIrcServer *getTwitchAbstract()
+        override;
     PubSub *getTwitchPubSub() override;
     ILogging *getChatLogger() override;
     FfzBadges *getFfzBadges() override;

src/CMakeLists.txt

@@ -338,22 +338,8 @@ set(SOURCE_FILES
         providers/ffz/FfzUtil.cpp
         providers/ffz/FfzUtil.hpp
 
-        providers/irc/AbstractIrcServer.cpp
-        providers/irc/AbstractIrcServer.hpp
-        providers/irc/Irc2.cpp
-        providers/irc/Irc2.hpp
-        providers/irc/IrcAccount.cpp
-        providers/irc/IrcAccount.hpp
-        providers/irc/IrcChannel2.cpp
-        providers/irc/IrcChannel2.hpp
-        providers/irc/IrcCommands.cpp
-        providers/irc/IrcCommands.hpp
         providers/irc/IrcConnection2.cpp
         providers/irc/IrcConnection2.hpp
-        providers/irc/IrcMessageBuilder.cpp
-        providers/irc/IrcMessageBuilder.hpp
-        providers/irc/IrcServer.cpp
-        providers/irc/IrcServer.hpp
 
         providers/links/LinkInfo.cpp
         providers/links/LinkInfo.hpp
@@ -575,9 +561,6 @@ set(SOURCE_FILES
         widgets/dialogs/EditHotkeyDialog.hpp
         widgets/dialogs/EmotePopup.cpp
         widgets/dialogs/EmotePopup.hpp
-        widgets/dialogs/IrcConnectionEditor.cpp
-        widgets/dialogs/IrcConnectionEditor.hpp
-        widgets/dialogs/IrcConnectionEditor.ui
         widgets/dialogs/LastRunCrashDialog.cpp
         widgets/dialogs/LastRunCrashDialog.hpp
         widgets/dialogs/LoginDialog.cpp

src/common/Channel.cpp

@@ -3,8 +3,6 @@
 #include "Application.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "providers/irc/IrcChannel2.hpp"
-#include "providers/irc/IrcServer.hpp"
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Logging.hpp"
@@ -36,8 +34,6 @@ Channel::Channel(const QString &name, Type type)
     {
         this->platform_ = "twitch";
     }
-
-    // Irc platform is set through IrcChannel2 ctor
 }
 
 Channel::~Channel()

src/common/Channel.hpp

@@ -53,7 +53,6 @@ class Channel : public std::enable_shared_from_this<Channel>
         TwitchLive,
         TwitchAutomod,
         TwitchEnd,
-        Irc,
         Misc,
     };
 
@@ -185,8 +184,6 @@ constexpr magic_enum::customize::customize_t
             return "live";
         case Type::TwitchAutomod:
             return "automod";
-        case Type::Irc:
-            return "irc";
         case Type::Misc:
             return "misc";
         default:

src/controllers/commands/builtin/twitch/SendWhisper.cpp

@@ -9,8 +9,6 @@
 #include "messages/MessageElement.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/ffz/FfzEmotes.hpp"
-#include "providers/irc/IrcChannel2.hpp"
-#include "providers/irc/IrcServer.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
@@ -242,17 +240,6 @@ QString sendWhisper(const CommandContext &ctx)
         return "";
     }
 
-    // we must be on IRC
-    auto *ircChannel = dynamic_cast<IrcChannel *>(ctx.channel.get());
-    if (ircChannel == nullptr)
-    {
-        // give up
-        return "";
-    }
-
-    auto *server = ircChannel->server();
-    server->sendWhisper(target, message);
-
     return "";
 }