diff --git a/src/providers/twitch/twitchmessagebuilder.cpp b/src/providers/twitch/twitchmessagebuilder.cpp index c30640f73..3ffa2dd84 100644 --- a/src/providers/twitch/twitchmessagebuilder.cpp +++ b/src/providers/twitch/twitchmessagebuilder.cpp @@ -545,9 +545,6 @@ bool TwitchMessageBuilder::tryAppendEmote(QString &emoteString) this->twitchChannel->ffzChannelEmotes->tryGet(emoteString, emoteData)) { // FFZ Channel Emote return appendEmote(MessageElement::FfzEmote); - } else if (app->emotes->getChatterinoEmotes().tryGet(emoteString, emoteData)) { - // Chatterino Emote - return appendEmote(MessageElement::Misc); } return false; diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp index df2ce56c4..5ca1d8026 100644 --- a/src/singletons/emotemanager.cpp +++ b/src/singletons/emotemanager.cpp @@ -27,11 +27,6 @@ void EmoteManager::initialize() this->gifTimer.initialize(); } -util::EmoteMap &EmoteManager::getChatterinoEmotes() -{ - return _chatterinoEmotes; -} - util::EmoteData EmoteManager::getCheerImage(long long amount, bool animated) { // TODO: fix this xD diff --git a/src/singletons/emotemanager.hpp b/src/singletons/emotemanager.hpp index f64ded71c..a3d0da6f1 100644 --- a/src/singletons/emotemanager.hpp +++ b/src/singletons/emotemanager.hpp @@ -30,17 +30,11 @@ public: void initialize(); - util::EmoteMap &getChatterinoEmotes(); - util::EmoteData getCheerImage(long long int amount, bool animated); // Bit badge/emotes? // TODO: Move to twitch emote provider util::ConcurrentMap miscImageCache; - -private: - /// Chatterino emotes - util::EmoteMap _chatterinoEmotes; }; } // namespace singletons