Move emojis to its own class

src/singletons/emotemanager.hpp

@@ -2,21 +2,16 @@
 
 #define GIF_FRAME_LENGTH 33
 
-#include "emojis.hpp"
 #include "messages/image.hpp"
 #include "providers/bttv/bttvemotes.hpp"
+#include "providers/emoji/emojis.hpp"
 #include "providers/ffz/ffzemotes.hpp"
 #include "providers/twitch/twitchemotes.hpp"
-#include "signalvector.hpp"
 #include "singletons/helper/giftimer.hpp"
 #include "util/concurrentmap.hpp"
 #include "util/emotemap.hpp"
 
-#include <QMap>
-#include <QMutex>
-#include <QRegularExpression>
 #include <QString>
-#include <QTimer>
 
 namespace chatterino {
 namespace singletons {
@@ -24,20 +19,18 @@ namespace singletons {
 class EmoteManager
 {
 public:
-    EmoteManager();
-
     ~EmoteManager() = delete;
 
     providers::twitch::TwitchEmotes twitch;
     providers::bttv::BTTVEmotes bttv;
     providers::ffz::FFZEmotes ffz;
+    providers::emoji::Emojis emojis;
 
     GIFTimer gifTimer;
 
     void initialize();
 
     util::EmoteMap &getChatterinoEmotes();
-    util::EmojiMap &getEmojis();
 
     util::EmoteData getCheerImage(long long int amount, bool animated);
 
@@ -46,27 +39,6 @@ public:
     util::ConcurrentMap<QString, messages::Image *> miscImageCache;
 
 private:
-    /// Emojis
-    QRegularExpression findShortCodesRegex;
-
-    // shortCodeToEmoji maps strings like "sunglasses" to its emoji
-    QMap<QString, EmojiData> emojiShortCodeToEmoji;
-
-    // Maps the first character of the emoji unicode string to a vector of possible emojis
-    QMap<QChar, QVector<EmojiData>> emojiFirstByte;
-
-    util::EmojiMap emojis;
-
-    void loadEmojis();
-
-public:
-    void parseEmojis(std::vector<std::tuple<util::EmoteData, QString>> &parsedWords,
-                     const QString &text);
-
-    QString replaceShortCodes(const QString &text);
-
-    std::vector<std::string> emojiShortCodes;
-
     /// Chatterino emotes
     util::EmoteMap _chatterinoEmotes;
 };