moved some Settings from Application to Settings

src/singletons/Settings.cpp

@@ -1,19 +1,71 @@
 #include "singletons/Settings.hpp"
 
 #include "Application.hpp"
+#include "controllers/highlights/HighlightBlacklistUser.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
+#include "controllers/ignores/IgnorePhrase.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/WindowManager.hpp"
+#include "util/PersistSignalVector.hpp"
 #include "util/WindowsHelper.hpp"
 
 namespace chatterino {
 
+ConcurrentSettings *concurrentInstance_{};
+
+ConcurrentSettings::ConcurrentSettings()
+    : highlightedMessages(*new SignalVector<HighlightPhrase>())
+    , highlightedUsers(*new SignalVector<HighlightPhrase>())
+    , blacklistedUsers(*new SignalVector<HighlightBlacklistUser>())
+    , ignoredMessages(*new SignalVector<IgnorePhrase>())
+{
+}
+
+bool ConcurrentSettings::isHighlightedUser(const QString &username)
+{
+    for (const auto &highlightedUser : this->highlightedUsers)
+    {
+        if (highlightedUser.isMatch(username))
+            return true;
+    }
+
+    return false;
+}
+
+bool ConcurrentSettings::isBlacklistedUser(const QString &username)
+{
+    auto items = this->blacklistedUsers.readOnly();
+
+    for (const auto &blacklistedUser : *items)
+    {
+        if (blacklistedUser.isMatch(username))
+            return true;
+    }
+
+    return false;
+}
+
+ConcurrentSettings &getCSettings()
+{
+    // `concurrentInstance_` gets assigned in Settings ctor.
+    assert(concurrentInstance_);
+
+    return *concurrentInstance_;
+}
+
 Settings *Settings::instance_ = nullptr;
 
 Settings::Settings(const QString &settingsDirectory)
     : ABSettings(settingsDirectory)
 {
     instance_ = this;
+    concurrentInstance_ = this;
+
+    persist(this->highlightedMessages, "/highlighting/highlights");
+    persist(this->blacklistedUsers, "/highlighting/blacklist");
+    persist(this->highlightedUsers, "/highlighting/users");
+    persist(this->ignoredMessages, "/ignore/phrases");
 
 #ifdef USEWINSDK
     this->autorun = isRegisteredForStartup();

src/singletons/Settings.hpp

@@ -5,13 +5,38 @@
 
 #include "BaseSettings.hpp"
 #include "common/Channel.hpp"
+#include "common/SignalVector.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
 #include "singletons/Toasts.hpp"
 
 namespace chatterino {
 
-class Settings : public ABSettings
+class HighlightPhrase;
+class HighlightBlacklistUser;
+class IgnorePhrase;
+
+// Settings which are availlable for reading on all threads.
+class ConcurrentSettings
+{
+public:
+    ConcurrentSettings();
+
+    // clang-format off
+    SignalVector<HighlightPhrase>        &highlightedMessages;
+    SignalVector<HighlightPhrase>        &highlightedUsers;
+    SignalVector<HighlightBlacklistUser> &blacklistedUsers;
+    SignalVector<IgnorePhrase>           &ignoredMessages;
+    // clang-format on
+
+    bool isHighlightedUser(const QString &username);
+    bool isBlacklistedUser(const QString &username);
+};
+
+ConcurrentSettings &getCSettings();
+
+// These settings are still accessed concurrently in the code but it is bad practice.
+class Settings : public ABSettings, public ConcurrentSettings
 {
     static Settings *instance_;