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

Change emote parsing order to FFZ -> BTTV -> GlobalFFZ -> GlobalBTTV

Browse source 
Fixes #877
This commit is contained in:
Ruben Anders 2019-05-20 20:06:32 +02:00 committed by pajlada
parent 0263248668
commit 9dbe66a19b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -987,9 +987,9 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
auto flags = MessageElementFlags();
auto emote = boost::optional<EmotePtr>{};
if ((emote = this->twitchChannel->globalBttv().emote(name)))
if ((emote = this->twitchChannel->ffzEmote().emote(name)))
{
flags = MessageElementFlag::BttvEmote;
flags = MessageElementFlag::FfzEmote;
}
else if ((emote = this->twitchChannel->bttvEmote(name)))
{
@ -999,9 +999,9 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
{
flags = MessageElementFlag::FfzEmote;
}
else if ((emote = this->twitchChannel->ffzEmote(name)))
else if ((emote = this->twitchChannel->globalBttv(name)))
{
flags = MessageElementFlag::FfzEmote;
flags = MessageElementFlag::BttvEmote;
}
if (emote)