Fix Handling of FFZ CDN URLs with https already appended (#4432)

This commit is contained in:
Daniel Sage
2023-03-04 19:34:36 -05:00
committed by GitHub
parent 1dc2bcc445
commit b9e87dcd2b
6 changed files with 37 additions and 9 deletions
+7 -8
View File
@@ -4,6 +4,7 @@
#include "common/NetworkResult.hpp"
#include "common/Outcome.hpp"
#include "messages/Emote.hpp"
#include "providers/ffz/FfzUtil.hpp"
#include <QJsonArray>
#include <QJsonObject>
@@ -67,14 +68,12 @@ void FfzBadges::load()
auto jsonBadge = jsonBadge_.toObject();
auto jsonUrls = jsonBadge.value("urls").toObject();
auto emote = Emote{
EmoteName{},
ImageSet{
Url{QString("https:") + jsonUrls.value("1").toString()},
Url{QString("https:") + jsonUrls.value("2").toString()},
Url{QString("https:") +
jsonUrls.value("4").toString()}},
Tooltip{jsonBadge.value("title").toString()}, Url{}};
auto emote =
Emote{EmoteName{},
ImageSet{parseFfzUrl(jsonUrls.value("1").toString()),
parseFfzUrl(jsonUrls.value("2").toString()),
parseFfzUrl(jsonUrls.value("4").toString())},
Tooltip{jsonBadge.value("title").toString()}, Url{}};
Badge badge;