Merge branch 'master' into chore/unsingletonize-sound

Chatterino · Jun 16, 2024 · 8550dc6 · 8550dc6
2 parents 17c70de + 85d6ff1
commit 8550dc6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,10 +29,12 @@
 - Dev: Refactor `TwitchIrcServer`, making it abstracted. (#5421, #5435)
 - Dev: Reduced the amount of scale events. (#5404, #5406)
 - Dev: Removed unused timegate settings. (#5361)
+- Dev: Unsingletonize `Resources2`. (#5460)
 - Dev: All Lua globals now show in the `c2` global in the LuaLS metadata. (#5385)
 - Dev: Images are now loaded in worker threads. (#5431)
 - Dev: Qt Creator now auto-configures Conan when loading the project and skips vcpkg. (#5305)
 - Dev: The MSVC CRT is now bundled with Chatterino as it depends on having a recent version installed. (#5447)
+- Dev: Refactor/unsingletonize `UserDataController`. (#5459)
 
 ## 2.5.1
 

diff --git a/cmake/resources/ResourcesAutogen.hpp.in b/cmake/resources/ResourcesAutogen.hpp.in
@@ -3,15 +3,14 @@
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 #include <QPixmap>
-#include "common/Singleton.hpp"
 
 namespace chatterino {
 
-class Resources2 : public Singleton
+class Resources2
 {
 public:
     Resources2();
 
 @RES_HEADER_CONTENT@
 };
-}  // namespace chatterino
+}  // namespace chatterino
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -135,7 +135,7 @@ Application::Application(Settings &_settings, const Paths &paths,
     , twitch(new TwitchIrcServer)
     , ffzBadges(&this->emplace<FfzBadges>())
     , seventvBadges(&this->emplace<SeventvBadges>())
-    , userData(&this->emplace(new UserDataController(paths)))
+    , userData(new UserDataController(paths))
     , sound(makeSoundController(_settings))
     , twitchLiveController(&this->emplace<TwitchLiveController>())
     , twitchPubSub(new PubSub(TWITCH_PUBSUB_URL))
@@ -174,6 +174,7 @@ void Application::fakeDtor()
     // this->twitch.reset();
     this->fonts.reset();
     this->sound.reset();
+    this->userData.reset();
 }
 
 void Application::initialize(Settings &settings, const Paths &paths)
@@ -428,7 +429,7 @@ IUserDataController *Application::getUserData()
 {
     assertInGuiThread();
 
-    return this->userData;
+    return this->userData.get();
 }
 
 ISoundController *Application::getSound()

diff --git a/src/Application.hpp b/src/Application.hpp
@@ -160,7 +160,7 @@ class Application : public IApplication
     std::unique_ptr<TwitchIrcServer> twitch;
     FfzBadges *const ffzBadges{};
     SeventvBadges *const seventvBadges{};
-    UserDataController *const userData{};
+    std::unique_ptr<UserDataController> userData;
     std::unique_ptr<ISoundController> sound;
     TwitchLiveController *const twitchLiveController{};
     std::unique_ptr<PubSub> twitchPubSub;

diff --git a/src/controllers/userdata/UserDataController.cpp b/src/controllers/userdata/UserDataController.cpp
@@ -37,11 +37,6 @@ UserDataController::UserDataController(const Paths &paths)
     this->users = this->setting.getValue();
 }
 
-void UserDataController::save()
-{
-    this->sm->save();
-}
-
 std::optional<UserData> UserDataController::getUser(const QString &userID) const
 {
     std::shared_lock lock(this->usersMutex);

diff --git a/src/controllers/userdata/UserDataController.hpp b/src/controllers/userdata/UserDataController.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Singleton.hpp"
 #include "controllers/userdata/UserData.hpp"
 #include "util/QStringHash.hpp"
 #include "util/RapidjsonHelpers.hpp"
@@ -30,7 +29,7 @@ class IUserDataController
                               const QString &colorString) = 0;
 };
 
-class UserDataController : public IUserDataController, public Singleton
+class UserDataController : public IUserDataController
 {
 public:
     explicit UserDataController(const Paths &paths);
@@ -43,9 +42,6 @@ class UserDataController : public IUserDataController, public Singleton
     void setUserColor(const QString &userID,
                       const QString &colorString) override;
 
-protected:
-    void save() override;
-
 private:
     void update(std::unordered_map<QString, UserData> &&newUsers);
 

diff --git a/src/singletons/Resources.cpp b/src/singletons/Resources.cpp
@@ -2,10 +2,15 @@
 
 #include "debug/AssertInGuiThread.hpp"
 
-namespace chatterino {
 namespace {
-    static Resources2 *resources = nullptr;
-}
+
+using namespace chatterino;
+
+static Resources2 *resources = nullptr;
+
+}  // namespace
+
+namespace chatterino {
 
 Resources2 &getResources()
 {

diff --git a/tests/src/TwitchPubSubClient.cpp b/tests/src/TwitchPubSubClient.cpp
@@ -179,14 +179,7 @@ TEST(TwitchPubSubClient, DisconnectedAfter1s)
     ASSERT_EQ(pubSub.diag.messagesReceived, 2);  // Listen RESPONSE & Pong
     ASSERT_EQ(pubSub.diag.listenResponses, 1);
 
-    std::this_thread::sleep_for(350ms);
-
-    ASSERT_EQ(pubSub.diag.connectionsOpened, 1);
-    ASSERT_EQ(pubSub.diag.connectionsClosed, 0);
-    ASSERT_EQ(pubSub.diag.connectionsFailed, 0);
-    ASSERT_EQ(pubSub.diag.messagesReceived, 2);
-
-    std::this_thread::sleep_for(600ms);
+    std::this_thread::sleep_for(950ms);
 
     ASSERT_EQ(pubSub.diag.connectionsOpened, 2);
     ASSERT_EQ(pubSub.diag.connectionsClosed, 1);