fix: deadlock and use-after-free in tests (#4981)

* fix: use-after-free in settings

* refactor: put seventv api into a singleton

* chore: add changelog entry

* Add warning for when the 7TV load fails

src/providers/seventv/SeventvAPI.cpp

@@ -78,11 +78,5 @@ void SeventvAPI::updatePresence(const QString &twitchChannelID,
         .execute();
 }
 
-SeventvAPI &getSeventvAPI()
-{
-    static SeventvAPI instance;
-    return instance;
-}
-
 }  // namespace chatterino
 // NOLINTEND(readability-convert-member-functions-to-static)

src/providers/seventv/SeventvAPI.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include <functional>
 
 class QString;
@@ -9,25 +11,33 @@ namespace chatterino {
 
 class NetworkResult;
 
-class SeventvAPI
+class SeventvAPI : public Singleton
 {
     using ErrorCallback = std::function<void(const NetworkResult &)>;
     template <typename... T>
     using SuccessCallback = std::function<void(T...)>;
 
 public:
-    void getUserByTwitchID(const QString &twitchID,
-                           SuccessCallback<const QJsonObject &> &&onSuccess,
-                           ErrorCallback &&onError);
-    void getEmoteSet(const QString &emoteSet,
-                     SuccessCallback<const QJsonObject &> &&onSuccess,
-                     ErrorCallback &&onError);
+    SeventvAPI() = default;
+    ~SeventvAPI() override = default;
 
-    void updatePresence(const QString &twitchChannelID,
-                        const QString &seventvUserID,
-                        SuccessCallback<> &&onSuccess, ErrorCallback &&onError);
+    SeventvAPI(const SeventvAPI &) = delete;
+    SeventvAPI(SeventvAPI &&) = delete;
+    SeventvAPI &operator=(const SeventvAPI &) = delete;
+    SeventvAPI &operator=(SeventvAPI &&) = delete;
+
+    virtual void getUserByTwitchID(
+        const QString &twitchID,
+        SuccessCallback<const QJsonObject &> &&onSuccess,
+        ErrorCallback &&onError);
+    virtual void getEmoteSet(const QString &emoteSet,
+                             SuccessCallback<const QJsonObject &> &&onSuccess,
+                             ErrorCallback &&onError);
+
+    virtual void updatePresence(const QString &twitchChannelID,
+                                const QString &seventvUserID,
+                                SuccessCallback<> &&onSuccess,
+                                ErrorCallback &&onError);
 };
 
-SeventvAPI &getSeventvAPI();
-
 }  // namespace chatterino

src/providers/seventv/SeventvBadges.cpp

@@ -2,15 +2,12 @@
 
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"
-#include "providers/seventv/SeventvAPI.hpp"
 #include "providers/seventv/SeventvEmotes.hpp"
 
 #include <QJsonArray>
 #include <QUrl>
 #include <QUrlQuery>
 
-#include <map>
-
 namespace chatterino {
 
 std::optional<EmotePtr> SeventvBadges::getBadge(const UserId &id) const

src/providers/seventv/SeventvEmotes.cpp

@@ -1,5 +1,6 @@
 #include "providers/seventv/SeventvEmotes.hpp"
 
+#include "Application.hpp"
 #include "common/Literals.hpp"
 #include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
@@ -214,7 +215,7 @@ void SeventvEmotes::loadGlobalEmotes()
 
     qCDebug(chatterinoSeventv) << "Loading 7TV Global Emotes";
 
-    getSeventvAPI().getEmoteSet(
+    getIApp()->getSeventvAPI()->getEmoteSet(
         u"global"_s,
         [this](const auto &json) {
             QJsonArray parsedEmotes = json["emotes"].toArray();
@@ -243,7 +244,7 @@ void SeventvEmotes::loadChannelEmotes(
     qCDebug(chatterinoSeventv)
         << "Reloading 7TV Channel Emotes" << channelId << manualRefresh;
 
-    getSeventvAPI().getUserByTwitchID(
+    getIApp()->getSeventvAPI()->getUserByTwitchID(
         channelId,
         [callback = std::move(callback), channel, channelId,
          manualRefresh](const auto &json) {
@@ -405,7 +406,7 @@ void SeventvEmotes::getEmoteSet(
 {
     qCDebug(chatterinoSeventv) << "Loading 7TV Emote Set" << emoteSetId;
 
-    getSeventvAPI().getEmoteSet(
+    getIApp()->getSeventvAPI()->getEmoteSet(
         emoteSetId,
         [callback = std::move(successCallback), emoteSetId](const auto &json) {
             auto parsedEmotes = json["emotes"].toArray();

src/providers/twitch/TwitchAccount.cpp

@@ -491,7 +491,15 @@ void TwitchAccount::loadSeventvUserID()
         return;
     }
 
-    getSeventvAPI().getUserByTwitchID(
+    auto *seventv = getIApp()->getSeventvAPI();
+    if (!seventv)
+    {
+        qCWarning(chatterinoSeventv)
+            << "Not loading 7TV User ID because the 7TV API is not initialized";
+        return;
+    }
+
+    seventv->getUserByTwitchID(
         this->getUserId(),
         [this](const auto &json) {
             const auto id = json["user"]["id"].toString();

src/providers/twitch/TwitchChannel.cpp

@@ -1646,7 +1646,7 @@ void TwitchChannel::updateSevenTVActivity()
 
     qCDebug(chatterinoSeventv) << "Sending activity in" << this->getName();
 
-    getSeventvAPI().updatePresence(
+    getIApp()->getSeventvAPI()->updatePresence(
         this->roomId(), currentSeventvUserID,
         [chan = weakOf<Channel>(this)]() {
             const auto self =