noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/providers/IvrApi.cpp
View file

@ -40,7 +40,7 @@ void IvrApi::getBulkEmoteSets(QString emoteSetList,
QUrlQuery urlQuery;
urlQuery.addQueryItem("set_id", emoteSetList);
this->makeRequest("v2/twitch/emotes/sets", urlQuery)
this->makeRequest("twitch/emotes/sets", urlQuery)
.onSuccess([successCallback, failureCallback](auto result) -> Outcome {
auto root = result.parseJsonArray();
@ -61,7 +61,7 @@ NetworkRequest IvrApi::makeRequest(QString url, QUrlQuery urlQuery)
{
assert(!url.startsWith("/"));
const QString baseUrl("https://api.ivr.fi/");
const QString baseUrl("https://api.ivr.fi/v2/");
QUrl fullUrl(baseUrl + url);
fullUrl.setQuery(urlQuery);

12
src/providers/IvrApi.hpp
View file

@ -21,9 +21,9 @@ struct IvrSubage {
const int totalSubMonths;
const QString followingSince;
IvrSubage(QJsonObject root)
: isSubHidden(root.value("hidden").toBool())
, isSubbed(root.value("subscribed").toBool())
IvrSubage(const QJsonObject &root)
: isSubHidden(root.value("statusHidden").toBool())
, isSubbed(!root.value("meta").isNull())
, subTier(root.value("meta").toObject().value("tier").toString())
, totalSubMonths(
root.value("cumulative").toObject().value("months").toInt())
@ -40,7 +40,7 @@ struct IvrEmoteSet {
const QString tier;
const QJsonArray emotes;
IvrEmoteSet(QJsonObject root)
IvrEmoteSet(const QJsonObject &root)
: setId(root.value("setID").toString())
, displayName(root.value("channelName").toString())
, login(root.value("channelLogin").toString())
@ -60,7 +60,7 @@ struct IvrEmote {
const QString emoteType;
const QString imageType;
explicit IvrEmote(QJsonObject root)
explicit IvrEmote(const QJsonObject &root)
: code(root.value("code").toString())
, id(root.value("id").toString())
, setId(root.value("setID").toString())
@ -76,7 +76,7 @@ struct IvrEmote {
class IvrApi final : boost::noncopyable
{
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,
ResultCallback<IvrSubage> resultCallback,
IvrFailureCallback failureCallback);