Merge branch 'master' of https://github.com/fourtf/chatterino2

src/providers/bttv/BttvEmotes.cpp

@@ -1,6 +1,6 @@
 #include "providers/bttv/BttvEmotes.hpp"
 
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
 

src/providers/ffz/FfzEmotes.cpp

@@ -1,6 +1,6 @@
 #include "providers/ffz/FfzEmotes.hpp"
 
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
 

src/providers/twitch/TwitchAccount.cpp

@@ -1,7 +1,6 @@
 #include "providers/twitch/TwitchAccount.hpp"
 
 #include "common/NetworkRequest.hpp"
-#include "common/UrlFetch.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/PartialTwitchUser.hpp"
 #include "providers/twitch/TwitchCommon.hpp"

src/providers/twitch/TwitchChannel.cpp

@@ -1,7 +1,7 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
 #include "common/Common.hpp"
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
@@ -299,16 +299,21 @@ void TwitchChannel::refreshLiveStatus()
 
     QString url("https://api.twitch.tv/kraken/streams/" + roomID);
 
-    auto request = makeGetStreamRequest(roomID, QThread::currentThread());
+    //<<<<<<< HEAD
+    //    auto request = makeGetStreamRequest(roomID, QThread::currentThread());
+    //=======
+    //    auto request = NetworkRequest::twitchRequest(url);
+    //    request.setCaller(QThread::currentThread());
+    //>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
 
-    request.onSuccess([this, weak = this->weak_from_this()](auto result) {
-        ChannelPtr shared = weak.lock();
-        if (!shared) return false;
+    //    request.onSuccess([this, weak = this->weak_from_this()](auto result) {
+    //        ChannelPtr shared = weak.lock();
+    //        if (!shared) return false;
 
-        return this->parseLiveStatus(result.parseRapidJson());
-    });
+    //        return this->parseLiveStatus(result.parseRapidJson());
+    //    });
 
-    request.execute();
+    //    request.execute();
 }
 
 bool TwitchChannel::parseLiveStatus(const rapidjson::Document &document)

src/providers/twitch/TwitchEmotes.cpp

@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchEmotes.hpp"
 
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -216,11 +216,6 @@ MessagePtr TwitchMessageBuilder::build()
 
                 // Actually just text
                 QString linkString = this->matchLink(string);
-                auto fontStyle = FontStyle::ChatMedium;
-
-                if (string.startsWith('@') && app->settings->enableUsernameBold) {
-                    fontStyle = FontStyle::ChatMediumBold;
-                }
 
                 Link link;