chatterino2
Code Issues

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
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchMessageBuilder.cpp
+4 -4
View File
@@ -987,9 +987,9 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
auto flags = MessageElementFlags(); auto flags = MessageElementFlags();
auto emote = boost::optional<EmotePtr>{}; 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))) else if ((emote = this->twitchChannel->bttvEmote(name)))
{ {
@@ -999,9 +999,9 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
{ {
flags = MessageElementFlag::FfzEmote; 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) if (emote)