Move FFZ emotes to its own class

src/singletons/emotemanager.cpp

@@ -24,42 +24,6 @@ using namespace chatterino::messages;
 namespace chatterino {
 namespace singletons {
 
-namespace {
-
-QString GetFFZEmoteLink(const QJsonObject &urls, const QString &emoteScale)
-{
-    auto emote = urls.value(emoteScale);
-    if (emote.isUndefined()) {
-        return "";
-    }
-
-    assert(emote.isString());
-
-    return "https:" + emote.toString();
-}
-
-void FillInFFZEmoteData(const QJsonObject &urls, const QString &code, const QString &tooltip,
-                        util::EmoteData &emoteData)
-{
-    QString url1x = GetFFZEmoteLink(urls, "1");
-    QString url2x = GetFFZEmoteLink(urls, "2");
-    QString url3x = GetFFZEmoteLink(urls, "4");
-
-    assert(!url1x.isEmpty());
-
-    emoteData.image1x = new Image(url1x, 1, code, tooltip);
-
-    if (!url2x.isEmpty()) {
-        emoteData.image2x = new Image(url2x, 0.5, code, tooltip);
-    }
-
-    if (!url3x.isEmpty()) {
-        emoteData.image3x = new Image(url3x, 0.25, code, tooltip);
-    }
-}
-
-}  // namespace
-
 EmoteManager::EmoteManager()
     : findShortCodesRegex(":([-+\\w]+):")
 {
@@ -76,65 +40,7 @@ void EmoteManager::initialize()
 
     this->loadEmojis();
     this->bttv.loadGlobalEmotes();
-    this->loadFFZEmotes();
-}
-
-void EmoteManager::reloadFFZChannelEmotes(const QString &channelName,
-                                          std::weak_ptr<util::EmoteMap> _map)
-{
-    printf("[EmoteManager] Reload FFZ Channel Emotes for channel %s\n", qPrintable(channelName));
-
-    QString url("https://api.frankerfacez.com/v1/room/" + channelName);
-
-    util::NetworkRequest req(url);
-    req.setCaller(QThread::currentThread());
-    req.setTimeout(3000);
-    req.getJSON([this, channelName, _map](QJsonObject &rootNode) {
-        auto map = _map.lock();
-
-        if (_map.expired()) {
-            return;
-        }
-
-        map->clear();
-
-        auto setsNode = rootNode.value("sets").toObject();
-
-        std::vector<std::string> codes;
-        for (const QJsonValue &setNode : setsNode) {
-            auto emotesNode = setNode.toObject().value("emoticons").toArray();
-
-            for (const QJsonValue &emoteNode : emotesNode) {
-                QJsonObject emoteObject = emoteNode.toObject();
-
-                // margins
-                int id = emoteObject.value("id").toInt();
-                QString code = emoteObject.value("name").toString();
-
-                QJsonObject urls = emoteObject.value("urls").toObject();
-
-                auto emote = this->getFFZChannelEmoteFromCaches().getOrAdd(id, [id, &code, &urls] {
-                    util::EmoteData emoteData;
-                    FillInFFZEmoteData(urls, code, code + "<br/>Channel FFZ Emote", emoteData);
-                    emoteData.pageLink =
-                        QString("https://www.frankerfacez.com/emoticon/%1-%2").arg(id).arg(code);
-
-                    return emoteData;
-                });
-
-                this->ffzChannelEmotes.insert(code, emote);
-                map->insert(code, emote);
-                codes.push_back(code.toStdString());
-            }
-
-            this->ffzChannelEmoteCodes[channelName.toStdString()] = codes;
-        }
-    });
-}
-
-util::EmoteMap &EmoteManager::getFFZEmotes()
-{
-    return ffzGlobalEmotes;
+    this->ffz.loadGlobalEmotes();
 }
 
 util::EmoteMap &EmoteManager::getChatterinoEmotes()
@@ -147,11 +53,6 @@ util::EmojiMap &EmoteManager::getEmojis()
     return this->emojis;
 }
 
-util::ConcurrentMap<int, util::EmoteData> &EmoteManager::getFFZChannelEmoteFromCaches()
-{
-    return _ffzChannelEmoteFromCaches;
-}
-
 void EmoteManager::loadEmojis()
 {
     QFile file(":/emojidata.txt");
@@ -327,41 +228,6 @@ QString EmoteManager::replaceShortCodes(const QString &text)
     return ret;
 }
 
-void EmoteManager::loadFFZEmotes()
-{
-    QString url("https://api.frankerfacez.com/v1/set/global");
-
-    util::NetworkRequest req(url);
-    req.setCaller(QThread::currentThread());
-    req.setTimeout(30000);
-    req.getJSON([this](QJsonObject &root) {
-        auto sets = root.value("sets").toObject();
-
-        std::vector<std::string> codes;
-        for (const QJsonValue &set : sets) {
-            auto emoticons = set.toObject().value("emoticons").toArray();
-
-            for (const QJsonValue &emote : emoticons) {
-                QJsonObject object = emote.toObject();
-
-                QString code = object.value("name").toString();
-                int id = object.value("id").toInt();
-                QJsonObject urls = object.value("urls").toObject();
-
-                util::EmoteData emoteData;
-                FillInFFZEmoteData(urls, code, code + "<br/>Global FFZ Emote", emoteData);
-                emoteData.pageLink =
-                    QString("https://www.frankerfacez.com/emoticon/%1-%2").arg(id).arg(code);
-
-                this->ffzGlobalEmotes.insert(code, emoteData);
-                codes.push_back(code.toStdString());
-            }
-
-            this->ffzGlobalEmoteCodes = codes;
-        }
-    });
-}
-
 util::EmoteData EmoteManager::getCheerImage(long long amount, bool animated)
 {
     // TODO: fix this xD