categorized emtotepopup

src/providers/bttv/BttvEmotes.cpp

@@ -10,9 +10,7 @@
 #include <QThread>
 
 namespace chatterino {
-
 namespace {
-
 Url getEmoteLink(QString urlTemplate, const EmoteId &id,
                  const QString &emoteScale)
 {
@@ -21,72 +19,14 @@ Url getEmoteLink(QString urlTemplate, const EmoteId &id,
     return {urlTemplate.replace("{{id}}", id.string)
                 .replace("{{image}}", emoteScale)};
 }
-
-}  // namespace
-
-AccessGuard<const EmoteMap> BttvEmotes::accessGlobalEmotes() const
-{
-    return this->globalEmotes_.accessConst();
-}
-
-boost::optional<EmotePtr> BttvEmotes::getGlobalEmote(const EmoteName &name)
-{
-    auto emotes = this->globalEmotes_.access();
-    auto it = emotes->find(name);
-
-    if (it == emotes->end()) return boost::none;
-    return it->second;
-}
-
-// FOURTF: never returns anything
-// boost::optional<EmotePtr> BttvEmotes::getEmote(const EmoteId &id)
-//{
-//    auto cache = this->channelEmoteCache_.access();
-//    auto it = cache->find(id);
-//
-//    if (it != cache->end()) {
-//        auto shared = it->second.lock();
-//        if (shared) {
-//            return shared;
-//        }
-//    }
-//
-//    return boost::none;
-//}
-
-void BttvEmotes::loadGlobalEmotes()
-{
-    auto request = NetworkRequest(QString(globalEmoteApiUrl));
-
-    request.setCaller(QThread::currentThread());
-    request.setTimeout(30000);
-    request.onSuccess([this](auto result) -> Outcome {
-        //        if (auto shared = weak.lock()) {
-        auto currentEmotes = this->globalEmotes_.access();
-
-        auto pair = this->parseGlobalEmotes(result.parseJson(), *currentEmotes);
-
-        if (pair.first) {
-            *currentEmotes = std::move(pair.second);
-        }
-
-        return pair.first;
-        //        }
-        return Failure;
-    });
-
-    request.execute();
-}
-
-std::pair<Outcome, EmoteMap> BttvEmotes::parseGlobalEmotes(
-    const QJsonObject &jsonRoot, const EmoteMap &currentEmotes)
+std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
+                                               const EmoteMap &currentEmotes)
 {
     auto emotes = EmoteMap();
     auto jsonEmotes = jsonRoot.value("emotes").toArray();
-    auto urlTemplate =
-        QString("https:" + jsonRoot.value("urlTemplate").toString());
+    auto urlTemplate = qS("https:") + jsonRoot.value("urlTemplate").toString();
 
-    for (const QJsonValue &jsonEmote : jsonEmotes) {
+    for (auto jsonEmote : jsonEmotes) {
         auto id = EmoteId{jsonEmote.toObject().value("id").toString()};
         auto name = EmoteName{jsonEmote.toObject().value("code").toString()};
 
@@ -99,16 +39,49 @@ std::pair<Outcome, EmoteMap> BttvEmotes::parseGlobalEmotes(
              Tooltip{name.string + "<br />Global Bttv Emote"},
              Url{"https://manage.betterttv.net/emotes/" + id.string}});
 
-        auto it = currentEmotes.find(name);
-        if (it != currentEmotes.end() && *it->second == emote) {
-            // reuse old shared_ptr if nothing changed
-            emotes[name] = it->second;
-        } else {
-            emotes[name] = std::make_shared<Emote>(std::move(emote));
-        }
+        emotes[name] = cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
     }
 
     return {Success, std::move(emotes)};
 }
+}  // namespace
+
+BttvEmotes::BttvEmotes()
+    : global_(std::make_shared<EmoteMap>())
+{
+}
+
+std::shared_ptr<const EmoteMap> BttvEmotes::global() const
+{
+    return this->global_.get();
+}
+
+boost::optional<EmotePtr> BttvEmotes::global(const EmoteName &name) const
+{
+    auto emotes = this->global_.get();
+    auto it = emotes->find(name);
+
+    if (it == emotes->end()) return boost::none;
+    return it->second;
+}
+
+void BttvEmotes::loadGlobal()
+{
+    auto request = NetworkRequest(QString(globalEmoteApiUrl));
+
+    request.setCaller(QThread::currentThread());
+    request.setTimeout(30000);
+
+    request.onSuccess([this](auto result) -> Outcome {
+        auto emotes = this->global_.get();
+        auto pair = parseGlobalEmotes(result.parseJson(), *emotes);
+        if (pair.first)
+            this->global_.set(
+                std::make_shared<EmoteMap>(std::move(pair.second)));
+        return pair.first;
+    });
+
+    request.execute();
+}
 
 }  // namespace chatterino