Change emote parsing order to FFZ -> BTTV -> GlobalFFZ -> GlobalBTTV
Fixes #877
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user