Merge branch 'master' into git_is_pepega

src/common/Env.cpp

@@ -1,5 +1,7 @@
 #include "common/Env.hpp"
 
+#include <QVariant>
+
 namespace chatterino {
 
 namespace {
@@ -15,6 +17,33 @@ namespace {
         return defaultValue;
     }
 
+    uint16_t readPortEnv(const char *envName, uint16_t defaultValue)
+    {
+        auto envString = std::getenv(envName);
+        if (envString != nullptr)
+        {
+            bool ok;
+            auto val = QString(envString).toUShort(&ok);
+            if (ok)
+            {
+                return val;
+            }
+        }
+
+        return defaultValue;
+    }
+
+    uint16_t readBoolEnv(const char *envName, bool defaultValue)
+    {
+        auto envString = std::getenv(envName);
+        if (envString != nullptr)
+        {
+            return QVariant(QString(envString)).toBool();
+        }
+
+        return defaultValue;
+    }
+
 }  // namespace
 
 Env::Env()
@@ -30,6 +59,10 @@ Env::Env()
           "https://braize.pajlada.com/chatterino/twitchemotes/set/%1/"))
     , imageUploaderUrl(readStringEnv("CHATTERINO2_IMAGE_PASTE_SITE_URL",
                                       "https://i.nuuls.com/upload"))
+    , twitchServerHost(
+          readStringEnv("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv"))
+    , twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 6697))
+    , twitchServerSecure(readBoolEnv("CHATTERINO2_TWITCH_SERVER_SECURE", true))
 {
 }