chatterino2
Code Issues

Move FFZ emotes to its own class

Browse Source
This commit is contained in:
Rasmus Karlsson
2018-06-05 18:07:17 +02:00
committed by fourtf
parent f83c07be53
commit 78664f79ee
9 changed files with 194 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/twitchchannel.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ void TwitchChannel::reloadChannelEmotes()
debug::Log("[TwitchChannel:{}] Reloading channel emotes", this->name);
app->emotes->bttv.loadChannelEmotes(this->name, this->bttvChannelEmotes);
app->emotes->reloadFFZChannelEmotes(this->name, this->ffzChannelEmotes);
app->emotes->ffz.loadChannelEmotes(this->name, this->ffzChannelEmotes);
}
void TwitchChannel::sendMessage(const QString &message)
src/providers/twitch/twitchmessagebuilder.cpp
+1 -1
View File
@@ -538,7 +538,7 @@ bool TwitchMessageBuilder::tryAppendEmote(QString &emoteString)
this->twitchChannel->bttvChannelEmotes->tryGet(emoteString, emoteData)) {
// BTTV Channel Emote
return appendEmote(MessageElement::BttvEmote);
} else if (app->emotes->ffzGlobalEmotes.tryGet(emoteString, emoteData)) {
} else if (app->emotes->ffz.globalEmotes.tryGet(emoteString, emoteData)) {
// FFZ Global Emote
return appendEmote(MessageElement::FfzEmote);
} else if (this->twitchChannel != nullptr &&