Merge branch 'master' into git_is_pepega

src/common/Channel.cpp

@@ -1,9 +1,9 @@
 #include "common/Channel.hpp"
 
 #include "Application.hpp"
-#include "debug/Log.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "providers/twitch/IrcMessageHandler.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Logging.hpp"
 #include "singletons/Settings.hpp"

src/common/CompletionModel.cpp

@@ -6,7 +6,6 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Benchmark.hpp"
-#include "debug/Log.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Emotes.hpp"

src/common/DownloadManager.cpp

@@ -1,6 +1,5 @@
 #include "DownloadManager.hpp"
 
-#include "debug/Log.hpp"
 #include "singletons/Paths.hpp"
 
 #include <QDesktopServices>
@@ -41,7 +40,7 @@ void DownloadManager::setFile(QString fileURL, const QString &channelName)
 
 void DownloadManager::onDownloadProgress(qint64 bytesRead, qint64 bytesTotal)
 {
-    log("Download progress: {}/{}", bytesRead, bytesTotal);
+    qDebug() << "Download progress: " << bytesRead << "/" << bytesTotal;
 }
 
 void DownloadManager::onFinished(QNetworkReply *reply)

src/common/Env.cpp

@@ -61,7 +61,7 @@ Env::Env()
                                      "https://i.nuuls.com/upload"))
     , twitchServerHost(
           readStringEnv("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv"))
-    , twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 6697))
+    , twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 443))
     , twitchServerSecure(readBoolEnv("CHATTERINO2_TWITCH_SERVER_SECURE", true))
 {
 }

src/common/NetworkPrivate.cpp

@@ -4,7 +4,6 @@
 #include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "debug/AssertInGuiThread.hpp"
-#include "debug/Log.hpp"
 #include "singletons/Paths.hpp"
 #include "util/DebugCount.hpp"
 #include "util/PostToThread.hpp"
@@ -124,7 +123,7 @@ void loadUncached(const std::shared_ptr<NetworkData> &data)
 
         if (reply == nullptr)
         {
-            log("Unhandled request type");
+            qDebug() << "Unhandled request type";
             return;
         }
 
@@ -132,7 +131,7 @@ void loadUncached(const std::shared_ptr<NetworkData> &data)
         {
             QObject::connect(
                 data->timer_, &QTimer::timeout, worker, [reply, data]() {
-                    log("Aborted!");
+                    qDebug() << "Aborted!";
                     reply->abort();
                     if (data->onError_)
                     {

src/common/NetworkRequest.cpp

@@ -4,7 +4,6 @@
 #include "common/Outcome.hpp"
 #include "common/Version.hpp"
 #include "debug/AssertInGuiThread.hpp"
-#include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "singletons/Paths.hpp"
 #include "util/DebugCount.hpp"

src/common/NetworkResult.cpp

@@ -1,7 +1,5 @@
 #include "common/NetworkResult.hpp"
 
-#include "debug/Log.hpp"
-
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 #include <QJsonDocument>
@@ -45,8 +43,9 @@ rapidjson::Document NetworkResult::parseRapidJson() const
 
     if (result.Code() != rapidjson::kParseErrorNone)
     {
-        log("JSON parse error: {} ({})",
-            rapidjson::GetParseError_En(result.Code()), result.Offset());
+        qDebug() << "JSON parse error:"
+                 << rapidjson::GetParseError_En(result.Code()) << "("
+                 << result.Offset() << ")";
         return ret;
     }