new settings page

src/providers/LinkResolver.cpp

@@ -28,7 +28,7 @@ void LinkResolver::getLinkInfo(
         if (statusCode == 200)
         {
             response = root.value("tooltip").toString();
-            if (getSettings()->enableUnshortLinks)
+            if (getSettings()->unshortLinks)
             {
                 linkString = root.value("link").toString();
             }

src/providers/ffz/FfzModBadge.cpp

@@ -48,6 +48,7 @@ void FfzModBadge::loadCustomModBadge()
                            Url{url}};
 
         this->badge_ = std::make_shared<Emote>(emote);
+        //        getBadge.execute();
 
         return Success;
     });

src/providers/twitch/TwitchChannel.cpp

@@ -474,12 +474,9 @@ void TwitchChannel::refreshLiveStatus()
 
     QString url("https://api.twitch.tv/kraken/streams/" + roomID);
 
-    //<<<<<<< HEAD
     //    auto request = makeGetStreamRequest(roomID, QThread::currentThread());
-    //=======
     auto request = NetworkRequest::twitchRequest(url);
     request.setCaller(QThread::currentThread());
-    //>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
 
     request.onSuccess(
         [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {