From 0423702e501257c6a80b329c89d83a85f5f8e0bc Mon Sep 17 00:00:00 2001
From: Ckat <Ckat@teknik.io>
Date: Mon, 5 Mar 2018 22:37:01 +0100
Subject: [PATCH] actually display channel ffz emotes as channel ffz emotes
 (#279)

---
 src/singletons/emotemanager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp
index e48db006..470af5cb 100644
--- a/src/singletons/emotemanager.cpp
+++ b/src/singletons/emotemanager.cpp
@@ -63,14 +63,14 @@ static void FillInFFZEmoteData(const QJsonObject &urls, const QString &code,
 
     assert(!url1x.isEmpty());
 
-    emoteData.image1x = new Image(url1x, 1, code, code + "<br />Global FFZ Emote");
+    emoteData.image1x = new Image(url1x, 1, code, code);
 
     if (!url2x.isEmpty()) {
-        emoteData.image2x = new Image(url2x, 0.5, code, code + "<br />Global FFZ Emote");
+        emoteData.image2x = new Image(url2x, 0.5, code, code);
     }
 
     if (!url3x.isEmpty()) {
-        emoteData.image3x = new Image(url3x, 0.25, code, code + "<br />Global FFZ Emote");
+        emoteData.image3x = new Image(url3x, 0.25, code, code);
     }
 }
 
@@ -192,7 +192,7 @@ void EmoteManager::reloadFFZChannelEmotes(const QString &channelName,
                 auto emote =
                     this->getFFZChannelEmoteFromCaches().getOrAdd(id, [this, &code, &urls] {
                         util::EmoteData emoteData;
-                        FillInFFZEmoteData(urls, code, emoteData);
+                        FillInFFZEmoteData(urls, code + "<br/>Channel FFZ Emote", emoteData);
 
                         return emoteData;
                     });
@@ -524,7 +524,7 @@ void EmoteManager::loadFFZEmotes()
                 QJsonObject urls = object.value("urls").toObject();
 
                 util::EmoteData emoteData;
-                FillInFFZEmoteData(urls, code, emoteData);
+                FillInFFZEmoteData(urls, code + "<br/>Global FFZ Emote", emoteData);
 
                 this->ffzGlobalEmotes.insert(code, emoteData);
                 codes.push_back(code.toStdString());