From 935cd1bab07728dc63e5341072a0742fe3082c98 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 23 May 2018 13:47:22 +0200
Subject: [PATCH] Fixes #409 hovering smilies shows the regex emote code

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

diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp
index a1a781fbe..191c5c2fb 100644
--- a/src/singletons/emotemanager.cpp
+++ b/src/singletons/emotemanager.cpp
@@ -541,6 +541,19 @@ util::EmoteData EmoteManager::getTwitchEmoteById(long id, const QString &emoteNa
     QString _emoteName = emoteName;
     _emoteName.replace("<", "&lt;");
 
+    static QMap<QString, QString> emoteNameReplacements{
+        {"[oO](_|\\.)[oO]", "o_O"}, {"\\&gt\\;\\(", ">("}, {"\\&lt\\;3", "<3"},
+        {"\\:-?(o|O)", ":O"},       {"\\:-?(p|P)", ":P"},  {"\\:-?[\\\\/]", ":/"},
+        {"\\:-?[z|Z|\\|]", ":z"},   {"\\:-?\\(", ":("},    {"\\:-?\\)", ":)"},
+        {"\\:-?D", ":D"},           {"\\;-?(p|P)", ";P"},  {"\\;-?\\)", ";)"},
+        {"R-?\\)", "R-)"},
+    };
+
+    auto it = emoteNameReplacements.find(_emoteName);
+    if (it != emoteNameReplacements.end()) {
+        _emoteName = it.value();
+    }
+
     return _twitchEmoteFromCache.getOrAdd(id, [&emoteName, &_emoteName, &id] {
         util::EmoteData newEmoteData;
         newEmoteData.image1x = new Image(GetTwitchEmoteLink(id, "1.0"), 1, emoteName,