chatterino2
Code Issues

Move bttv emotes to its own class

Browse Source
This commit is contained in:
Rasmus Karlsson
2018-06-05 17:39:49 +02:00
committed by fourtf
parent e12d386a5a
commit f83c07be53
9 changed files with 174 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/twitchchannel.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ void TwitchChannel::reloadChannelEmotes()
debug::Log("[TwitchChannel:{}] Reloading channel emotes", this->name);
app->emotes->reloadBTTVChannelEmotes(this->name, this->bttvChannelEmotes);
app->emotes->bttv.loadChannelEmotes(this->name, this->bttvChannelEmotes);
app->emotes->reloadFFZChannelEmotes(this->name, this->ffzChannelEmotes);
}
src/providers/twitch/twitchmessagebuilder.cpp
+1 -1
View File
@@ -531,7 +531,7 @@ bool TwitchMessageBuilder::tryAppendEmote(QString &emoteString)
return true;
};
if (app->emotes->bttvGlobalEmotes.tryGet(emoteString, emoteData)) {
if (app->emotes->bttv.globalEmotes.tryGet(emoteString, emoteData)) {
// BTTV Global Emote
return appendEmote(MessageElement::BttvEmote);
} else if (this->twitchChannel != nullptr &&