From 9e59fb1a5f209e20d4db13ec3cb1341039be8440 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 28 Jun 2025 15:27:46 +0200 Subject: [PATCH] refactor: remove unused ignoredPhraseReplace setting (#6304) --- CHANGELOG.md | 1 + src/controllers/ignores/IgnorePhrase.cpp | 8 ++++---- src/controllers/ignores/IgnorePhrase.hpp | 3 +++ src/singletons/Settings.hpp | 4 ---- src/widgets/settingspages/IgnoresPage.cpp | 10 +++++++--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09a66f4a..750f7ae4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ - Dev: Pass `--force-openssl` when installing from CMake in Qt 6.8+. (#6129) - Dev: Fixed ` clean` not working correctly with generated sources. (#6154) - Dev: Removed authenticated PubSub implementation. (#6158) +- Dev: Removed unused `ignoredPhraseReplace` setting. (#6304) - Dev: Save settings in `aboutToQuit`. (#6159) - Dev: Bumped deprecation cutoff to Qt 6.4.3. (#6169) - Dev: Use `QMetaObject::invokeMethod` to run code on a specific thread. (#6203, #6278) diff --git a/src/controllers/ignores/IgnorePhrase.cpp b/src/controllers/ignores/IgnorePhrase.cpp index 41a49ec5..17dc84bf 100644 --- a/src/controllers/ignores/IgnorePhrase.cpp +++ b/src/controllers/ignores/IgnorePhrase.cpp @@ -2,8 +2,7 @@ #include "Application.hpp" #include "controllers/accounts/AccountController.hpp" -#include "providers/twitch/TwitchAccount.hpp" -#include "singletons/Settings.hpp" +#include "providers/twitch/TwitchAccount.hpp" // IWYU pragma: keep namespace chatterino { @@ -115,8 +114,9 @@ bool IgnorePhrase::containsEmote() const IgnorePhrase IgnorePhrase::createEmpty() { - return IgnorePhrase(QString(), false, false, - getSettings()->ignoredPhraseReplace.getValue(), true); + return { + {}, false, false, DEFAULT_IGNORE_PHRASE_REPLACE.toString(), true, + }; } } // namespace chatterino diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp index 5ff129fd..bff2657b 100644 --- a/src/controllers/ignores/IgnorePhrase.hpp +++ b/src/controllers/ignores/IgnorePhrase.hpp @@ -7,12 +7,15 @@ #include #include #include +#include #include #include namespace chatterino { +constexpr inline QStringView DEFAULT_IGNORE_PHRASE_REPLACE = u"***"; + struct Emote; using EmotePtr = std::shared_ptr; diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index ff7ef415..6568d47c 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -425,10 +425,6 @@ public: true, }; - /// Ignored Phrases - QStringSetting ignoredPhraseReplace = {"/ignore/ignoredPhraseReplace", - "***"}; - /// Blocked Users BoolSetting enableTwitchBlockedUsers = {"/ignore/enableTwitchBlockedUsers", true}; diff --git a/src/widgets/settingspages/IgnoresPage.cpp b/src/widgets/settingspages/IgnoresPage.cpp index 8445fdeb..5e00c719 100644 --- a/src/widgets/settingspages/IgnoresPage.cpp +++ b/src/widgets/settingspages/IgnoresPage.cpp @@ -64,9 +64,13 @@ void addPhrasesTab(LayoutCreator layout) // We can safely ignore this signal connection since we own the view std::ignore = view->addButtonPressed.connect([] { - getSettings()->ignoredMessages.append( - IgnorePhrase{"my pattern", false, false, - getSettings()->ignoredPhraseReplace.getValue(), true}); + getSettings()->ignoredMessages.append(IgnorePhrase{ + "my pattern", + false, + false, + DEFAULT_IGNORE_PHRASE_REPLACE.toString(), + true, + }); }); }