From 9dbe66a19b67a7509d2fa19dcb911c3fb3f1103b Mon Sep 17 00:00:00 2001
From: Ruben Anders <ruben.anders@robotty.de>
Date: Mon, 20 May 2019 20:06:32 +0200
Subject: [PATCH] Change emote parsing order to FFZ -> BTTV -> GlobalFFZ ->
 GlobalBTTV

Fixes #877
---
 src/providers/twitch/TwitchMessageBuilder.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index a694ad36d..b8cb7c860 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -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)