chatterino2
Code Issues

Clean up TwitchAccount emote stuff (#4243)

Browse Source 
* Remove unused TwitchAccount FollowResult enum

* Remove unused TwitchEmoteSetResolverResponse struct

* Remove unused and unimplemented `getEmoteSetBatches` function definition

* Remove unused `loadEmoteSetData` and `staticEmoteSets` from
TwitchAccount

* Remove forward declaration of TwitchAccount in TwitchAccountManager

* Clean up IgnorePhrase includes

* add missing newline in pubsubmanager.cpp
This commit is contained in:
pajlada
2022-12-18 15:36:39 +01:00
committed by GitHub
parent 8830b0e01c
commit a715b1ffff
27 changed files with 174 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchAccount.hpp
-37
View File
@@ -20,39 +20,6 @@
namespace chatterino {
enum FollowResult {
FollowResult_Following,
FollowResult_NotFollowing,
FollowResult_Failed,
};
struct TwitchEmoteSetResolverResponse {
const QString channelName;
const QString channelId;
const QString type;
const int tier;
const bool isCustom;
// Example response:
// {
// "channel_name": "zneix",
// "channel_id": "99631238",
// "type": "",
// "tier": 1,
// "custom": false
// }
TwitchEmoteSetResolverResponse(QJsonObject jsonObject)
: channelName(jsonObject.value("channel_name").toString())
, channelId(jsonObject.value("channel_id").toString())
, type(jsonObject.value("type").toString())
, tier(jsonObject.value("tier").toInt())
, isCustom(jsonObject.value("custom").toBool())
{
}
};
std::vector<QStringList> getEmoteSetBatches(QStringList emoteSetKeys);
class TwitchAccount : public Account
{
public:
@@ -69,8 +36,6 @@ public:
std::vector<TwitchEmote> emotes;
};
std::map<QString, EmoteSet> staticEmoteSets;
struct TwitchAccountEmoteData {
std::vector<std::shared_ptr<EmoteSet>> emoteSets;
@@ -127,8 +92,6 @@ public:
void autoModDeny(const QString msgID, ChannelPtr channel);
private:
void loadEmoteSetData(std::shared_ptr<EmoteSet> emoteSet);
QString oauthClient_;
QString oauthToken_;
QString userName_;