Migrate Twitch badges to Helix (#4537)

Co-authored-by: iProdigy <8106344+iProdigy@users.noreply.github.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Zonian
2023-04-16 04:58:45 -05:00
committed by GitHub
parent 594477d8b6
commit d6ef48d4ef
8 changed files with 307 additions and 54 deletions
+92
View File
@@ -2468,6 +2468,98 @@ void Helix::startCommercial(
.execute();
}
// Twitch global badges
// https://dev.twitch.tv/docs/api/reference/#get-global-chat-badges
void Helix::getGlobalBadges(
ResultCallback<HelixGlobalBadges> successCallback,
FailureCallback<HelixGetGlobalBadgesError, QString> failureCallback)
{
using Error = HelixGetGlobalBadgesError;
this->makeRequest("chat/badges/global", QUrlQuery())
.onSuccess([successCallback](auto result) -> Outcome {
if (result.status() != 200)
{
qCWarning(chatterinoTwitch)
<< "Success result for getting global badges was "
<< result.status() << "but we expected it to be 200";
}
auto response = result.parseJson();
successCallback(HelixGlobalBadges(response));
return Success;
})
.onError([failureCallback](auto result) {
auto obj = result.parseJson();
auto message = obj.value("message").toString();
switch (result.status())
{
case 401: {
failureCallback(Error::Forwarded, message);
}
break;
default: {
qCWarning(chatterinoTwitch)
<< "Helix global badges, unhandled error data:"
<< result.status() << result.getData() << obj;
failureCallback(Error::Unknown, message);
}
break;
}
})
.execute();
}
// Badges for the `broadcasterID` channel
// https://dev.twitch.tv/docs/api/reference/#get-channel-chat-badges
void Helix::getChannelBadges(
QString broadcasterID, ResultCallback<HelixChannelBadges> successCallback,
FailureCallback<HelixGetChannelBadgesError, QString> failureCallback)
{
using Error = HelixGetChannelBadgesError;
QUrlQuery urlQuery;
urlQuery.addQueryItem("broadcaster_id", broadcasterID);
this->makeRequest("chat/badges", urlQuery)
.onSuccess([successCallback](auto result) -> Outcome {
if (result.status() != 200)
{
qCWarning(chatterinoTwitch)
<< "Success result for getting badges was "
<< result.status() << "but we expected it to be 200";
}
auto response = result.parseJson();
successCallback(HelixChannelBadges(response));
return Success;
})
.onError([failureCallback](auto result) {
auto obj = result.parseJson();
auto message = obj.value("message").toString();
switch (result.status())
{
case 400:
case 401: {
failureCallback(Error::Forwarded, message);
}
break;
default: {
qCWarning(chatterinoTwitch)
<< "Helix channel badges, unhandled error data:"
<< result.status() << result.getData() << obj;
failureCallback(Error::Unknown, message);
}
break;
}
})
.execute();
}
NetworkRequest Helix::makeRequest(QString url, QUrlQuery urlQuery)
{
assert(!url.startsWith("/"));
+86
View File
@@ -384,6 +384,55 @@ struct HelixModerators {
}
};
struct HelixBadgeVersion {
QString id;
Url imageURL1x;
Url imageURL2x;
Url imageURL4x;
QString title;
Url clickURL;
explicit HelixBadgeVersion(const QJsonObject &jsonObject)
: id(jsonObject.value("id").toString())
, imageURL1x(Url{jsonObject.value("image_url_1x").toString()})
, imageURL2x(Url{jsonObject.value("image_url_2x").toString()})
, imageURL4x(Url{jsonObject.value("image_url_4x").toString()})
, title(jsonObject.value("title").toString())
, clickURL(Url{jsonObject.value("click_url").toString()})
{
}
};
struct HelixBadgeSet {
QString setID;
std::vector<HelixBadgeVersion> versions;
explicit HelixBadgeSet(const QJsonObject &json)
: setID(json.value("set_id").toString())
{
const auto jsonVersions = json.value("versions").toArray();
for (const auto &version : jsonVersions)
{
versions.emplace_back(version.toObject());
}
}
};
struct HelixGlobalBadges {
std::vector<HelixBadgeSet> badgeSets;
explicit HelixGlobalBadges(const QJsonObject &jsonObject)
{
const auto &data = jsonObject.value("data").toArray();
for (const auto &set : data)
{
this->badgeSets.emplace_back(set.toObject());
}
}
};
using HelixChannelBadges = HelixGlobalBadges;
enum class HelixAnnouncementColor {
Blue,
Green,
@@ -616,6 +665,15 @@ enum class HelixStartCommercialError {
Forwarded,
};
enum class HelixGetGlobalBadgesError {
Unknown,
// The error message is forwarded directly from the Twitch API
Forwarded,
};
using HelixGetChannelBadgesError = HelixGetGlobalBadgesError;
class IHelix
{
public:
@@ -899,6 +957,21 @@ public:
FailureCallback<HelixStartCommercialError, QString>
failureCallback) = 0;
// Get global Twitch badges
// https://dev.twitch.tv/docs/api/reference/#get-global-chat-badges
virtual void getGlobalBadges(
ResultCallback<HelixGlobalBadges> successCallback,
FailureCallback<HelixGetGlobalBadgesError, QString>
failureCallback) = 0;
// Get badges for the `broadcasterID` channel
// https://dev.twitch.tv/docs/api/reference/#get-channel-chat-badges
virtual void getChannelBadges(
QString broadcasterID,
ResultCallback<HelixChannelBadges> successCallback,
FailureCallback<HelixGetChannelBadgesError, QString>
failureCallback) = 0;
virtual void update(QString clientId, QString oauthToken) = 0;
protected:
@@ -1184,6 +1257,19 @@ public:
FailureCallback<HelixStartCommercialError, QString> failureCallback)
final;
// Get global Twitch badges
// https://dev.twitch.tv/docs/api/reference/#get-global-chat-badges
void getGlobalBadges(ResultCallback<HelixGlobalBadges> successCallback,
FailureCallback<HelixGetGlobalBadgesError, QString>
failureCallback) final;
// Get badges for the `broadcasterID` channel
// https://dev.twitch.tv/docs/api/reference/#get-channel-chat-badges
void getChannelBadges(QString broadcasterID,
ResultCallback<HelixChannelBadges> successCallback,
FailureCallback<HelixGetChannelBadgesError, QString>
failureCallback) final;
void update(QString clientId, QString oauthToken) final;
static void initialize();
+16
View File
@@ -136,6 +136,22 @@ Used in:
- `providers/twitch/TwitchChannel.cpp` to resolve a chats available cheer emotes. This helps us parse incoming messages like `pajaCheer1000`
### Get Global Badges
URL: https://dev.twitch.tv/docs/api/reference/#get-global-chat-badges
Used in:
- `providers/twitch/TwitchBadges.cpp` to load global badges
### Get Channel Badges
URL: https://dev.twitch.tv/docs/api/reference/#get-channel-chat-badges
Used in:
- `providers/twitch/TwitchChannel.cpp` to load channel badges
### Get Emote Sets
URL: https://dev.twitch.tv/docs/api/reference#get-emote-sets