chatterino2
Code Issues

Migrated getSubage to v2 version of the API (#4070)

Browse Source
This commit is contained in:
Kasia
2022-10-22 13:36:18 +02:00
committed by GitHub
parent 76530d061c
commit f7fcc90fe0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/IvrApi.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ void IvrApi::getBulkEmoteSets(QString emoteSetList,
QUrlQuery urlQuery; QUrlQuery urlQuery;
urlQuery.addQueryItem("set_id", emoteSetList); urlQuery.addQueryItem("set_id", emoteSetList);
this->makeRequest("v2/twitch/emotes/sets", urlQuery) this->makeRequest("twitch/emotes/sets", urlQuery)
.onSuccess([successCallback, failureCallback](auto result) -> Outcome { .onSuccess([successCallback, failureCallback](auto result) -> Outcome {
auto root = result.parseJsonArray(); auto root = result.parseJsonArray();
@@ -61,7 +61,7 @@ NetworkRequest IvrApi::makeRequest(QString url, QUrlQuery urlQuery)
{ {
assert(!url.startsWith("/")); assert(!url.startsWith("/"));
const QString baseUrl("https://api.ivr.fi/"); const QString baseUrl("https://api.ivr.fi/v2/");
QUrl fullUrl(baseUrl + url); QUrl fullUrl(baseUrl + url);
fullUrl.setQuery(urlQuery); fullUrl.setQuery(urlQuery);
src/providers/IvrApi.hpp
+6 -6
View File
@@ -21,9 +21,9 @@ struct IvrSubage {
const int totalSubMonths; const int totalSubMonths;
const QString followingSince; const QString followingSince;
IvrSubage(QJsonObject root) IvrSubage(const QJsonObject &root)
: isSubHidden(root.value("hidden").toBool()) : isSubHidden(root.value("statusHidden").toBool())
, isSubbed(root.value("subscribed").toBool()) , isSubbed(!root.value("meta").isNull())
, subTier(root.value("meta").toObject().value("tier").toString()) , subTier(root.value("meta").toObject().value("tier").toString())
, totalSubMonths( , totalSubMonths(
root.value("cumulative").toObject().value("months").toInt()) root.value("cumulative").toObject().value("months").toInt())
@@ -40,7 +40,7 @@ struct IvrEmoteSet {
const QString tier; const QString tier;
const QJsonArray emotes; const QJsonArray emotes;
IvrEmoteSet(QJsonObject root) IvrEmoteSet(const QJsonObject &root)
: setId(root.value("setID").toString()) : setId(root.value("setID").toString())
, displayName(root.value("channelName").toString()) , displayName(root.value("channelName").toString())
, login(root.value("channelLogin").toString()) , login(root.value("channelLogin").toString())
@@ -60,7 +60,7 @@ struct IvrEmote {
const QString emoteType; const QString emoteType;
const QString imageType; const QString imageType;
explicit IvrEmote(QJsonObject root) explicit IvrEmote(const QJsonObject &root)
: code(root.value("code").toString()) : code(root.value("code").toString())
, id(root.value("id").toString()) , id(root.value("id").toString())
, setId(root.value("setID").toString()) , setId(root.value("setID").toString())
@@ -76,7 +76,7 @@ struct IvrEmote {
class IvrApi final : boost::noncopyable class IvrApi final : boost::noncopyable
{ {
public: public:
// https://api.ivr.fi/docs#tag/Twitch/paths/~1twitch~1subage~1{username}~1{channel}/get // https://api.ivr.fi/v2/docs/static/index.html#/Twitch/get_twitch_subage__user___channel_
void getSubage(QString userName, QString channelName, void getSubage(QString userName, QString channelName,
ResultCallback<IvrSubage> resultCallback, ResultCallback<IvrSubage> resultCallback,
IvrFailureCallback failureCallback); IvrFailureCallback failureCallback);