diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp index aeddc38be..7bcb634c6 100644 --- a/src/singletons/emotemanager.cpp +++ b/src/singletons/emotemanager.cpp @@ -211,11 +211,6 @@ void EmoteManager::reloadFFZChannelEmotes(const QString &channelName, }); } -util::ConcurrentMap &EmoteManager::getTwitchEmotes() -{ - return _twitchEmotes; -} - util::EmoteMap &EmoteManager::getFFZEmotes() { return ffzGlobalEmotes; @@ -241,11 +236,6 @@ util::ConcurrentMap &EmoteManager::getFFZChannelEmoteFromC return _ffzChannelEmoteFromCaches; } -util::ConcurrentMap &EmoteManager::getTwitchEmoteFromCache() -{ - return _twitchEmoteFromCache; -} - void EmoteManager::loadEmojis() { QFile file(":/emojidata.txt"); @@ -549,6 +539,7 @@ util::EmoteData EmoteManager::getTwitchEmoteById(long id, const QString &emoteNa _emoteName.replace("<", "<"); _emoteName.replace(">", ">"); + // clang-format off static QMap emoteNameReplacements{ {"[oO](_|\\.)[oO]", "O_o"}, {"\\>\\;\\(", ">("}, {"\\<\\;3", "<3"}, {"\\:-?(o|O)", ":O"}, {"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"}, @@ -556,6 +547,7 @@ util::EmoteData EmoteManager::getTwitchEmoteById(long id, const QString &emoteNa {"\\:-?D", ":D"}, {"\\;-?(p|P)", ";P"}, {"\\;-?\\)", ";)"}, {"R-?\\)", "R)"}, {"B-?\\)", "B)"}, }; + // clang-format on auto it = emoteNameReplacements.find(_emoteName); if (it != emoteNameReplacements.end()) { diff --git a/src/singletons/emotemanager.hpp b/src/singletons/emotemanager.hpp index 37b56ca6d..a4d6806ff 100644 --- a/src/singletons/emotemanager.hpp +++ b/src/singletons/emotemanager.hpp @@ -34,13 +34,11 @@ public: void reloadFFZChannelEmotes(const QString &channelName, std::weak_ptr channelEmoteMap); - util::ConcurrentMap &getTwitchEmotes(); util::EmoteMap &getFFZEmotes(); util::EmoteMap &getChatterinoEmotes(); util::EmoteMap &getBTTVChannelEmoteFromCaches(); util::EmojiMap &getEmojis(); util::ConcurrentMap &getFFZChannelEmoteFromCaches(); - util::ConcurrentMap &getTwitchEmoteFromCache(); util::EmoteData getCheerImage(long long int amount, bool animated);