From ae9f92ded95005d36cc80c9d37fdae40d077b611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <zneix@zneix.eu>
Date: Sun, 18 Jul 2021 15:21:09 +0200
Subject: [PATCH] Make use of QUrlQuery in NetworkRequests where it was
 hardcoded into url (#3039)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 src/providers/twitch/TwitchBadges.cpp  |  8 ++++++--
 src/providers/twitch/TwitchChannel.cpp | 13 ++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/providers/twitch/TwitchBadges.cpp b/src/providers/twitch/TwitchBadges.cpp
index 65481ab5..4394da9e 100644
--- a/src/providers/twitch/TwitchBadges.cpp
+++ b/src/providers/twitch/TwitchBadges.cpp
@@ -7,6 +7,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QThread>
+#include <QUrlQuery>
 
 #include "common/NetworkRequest.hpp"
 #include "common/Outcome.hpp"
@@ -24,8 +25,11 @@ void TwitchBadges::loadTwitchBadges()
 {
     assert(this->loaded_ == false);
 
-    static QString url(
-        "https://badges.twitch.tv/v1/badges/global/display?language=en");
+    QUrl url("https://badges.twitch.tv/v1/badges/global/display");
+
+    QUrlQuery urlQuery;
+    urlQuery.addQueryItem("language", "en");
+    url.setQuery(urlQuery);
 
     NetworkRequest(url)
         .onSuccess([this](auto result) -> Outcome {
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 326ae9b5..4571cca2 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -755,11 +755,14 @@ void TwitchChannel::loadRecentMessages()
         return;
     }
 
-    auto baseURL = Env::get().recentMessagesApiUrl.arg(this->getName());
-
-    auto url = QString("%1?limit=%2")
-                   .arg(baseURL)
-                   .arg(getSettings()->twitchMessageHistoryLimit);
+    QUrl url(Env::get().recentMessagesApiUrl.arg(this->getName()));
+    QUrlQuery urlQuery(url);
+    if (!urlQuery.hasQueryItem("limit"))
+    {
+        urlQuery.addQueryItem(
+            "limit", QString::number(getSettings()->twitchMessageHistoryLimit));
+    }
+    url.setQuery(urlQuery);
 
     auto weak = weakOf<Channel>(this);