Merge branch 'master' into moderation

src/singletons/NativeMessaging.cpp

@@ -1,7 +1,7 @@
 #include "singletons/NativeMessaging.hpp"
 
 #include "Application.hpp"
-#include "providers/twitch/TwitchServer.hpp"
+#include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Paths.hpp"
 #include "util/PostToThread.hpp"
 

src/singletons/Paths.cpp

@@ -136,7 +136,7 @@ void Paths::initSubDirectories()
     this->messageLogDirectory = makePath("Logs");
     this->miscDirectory = makePath("Misc");
     this->twitchProfileAvatars = makePath("ProfileAvatars");
-    QDir().mkdir(this->twitchProfileAvatars + "/twitch");
+    //QDir().mkdir(this->twitchProfileAvatars + "/twitch");
 }
 
 Paths *getPaths()

src/singletons/Settings.hpp

@@ -201,6 +201,10 @@ public:
 
     /// Misc
     BoolSetting betaUpdates = {"/misc/beta", false};
+#ifdef Q_OS_LINUX
+    BoolSetting useKeyring = {"/misc/useKeyring", true};
+#endif
+
     IntSetting startUpNotification = {"/misc/startUpNotification", 0};
     QStringSetting currentVersion = {"/misc/currentVersion", ""};
     BoolSetting loadTwitchMessageHistoryOnConnect = {
@@ -210,6 +214,15 @@ public:
 
     QStringSetting cachePath = {"/cache/path", ""};
 
+    /// Debug
+    BoolSetting showUnhandledIrcMessages = {"/debug/showUnhandledIrcMessages",
+                                            false};
+
+    /// UI
+    // Purely QOL settings are here (like last item in a list).
+    IntSetting lastSelectChannelTab = {"/ui/lastSelectChannelTab", 0};
+    IntSetting lastSelectIrcConn = {"/ui/lastSelectIrcConn", 0};
+
 private:
     void updateModerationActions();
 };

src/singletons/Toasts.cpp

@@ -6,7 +6,7 @@
 #include "controllers/notifications/NotificationController.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
-#include "providers/twitch/TwitchServer.hpp"
+#include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Paths.hpp"
 #include "util/StreamLink.hpp"
 #include "widgets/helper/CommonTexts.hpp"

src/singletons/WindowManager.cpp

@@ -4,7 +4,10 @@
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Log.hpp"
 #include "messages/MessageElement.hpp"
-#include "providers/twitch/TwitchServer.hpp"
+#include "providers/irc/Irc2.hpp"
+#include "providers/irc/IrcChannel2.hpp"
+#include "providers/irc/IrcServer.hpp"
+#include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
@@ -611,6 +614,20 @@ void WindowManager::encodeChannel(IndirectChannel channel, QJsonObject &obj)
             obj.insert("type", "whispers");
         }
         break;
+        case Channel::Type::Irc:
+        {
+            if (auto ircChannel =
+                    dynamic_cast<IrcChannel *>(channel.get().get()))
+            {
+                obj.insert("type", "irc");
+                if (ircChannel->server())
+                {
+                    obj.insert("server", ircChannel->server()->id());
+                }
+                obj.insert("channel", ircChannel->getName());
+            }
+        }
+        break;
     }
 }
 
@@ -638,6 +655,11 @@ IndirectChannel WindowManager::decodeChannel(const QJsonObject &obj)
     {
         return app->twitch.server->whispersChannel;
     }
+    else if (type == "irc")
+    {
+        return Irc::getInstance().getOrAddChannel(
+            obj.value("server").toInt(-1), obj.value("channel").toString());
+    }
 
     return Channel::getEmpty();
 }