From c98267b433707a9e332d80e6fe36837dc6950c92 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 9 Mar 2025 13:11:06 +0100 Subject: [PATCH] fix: only hide messages from restricted users, not all suspicious users (#6049) it's probably best to leave this setting solo'd out as restricted users so monitored users can get their own behaviour in their own setting later --- CHANGELOG.md | 2 +- mocks/include/mocks/DisabledStreamerMode.hpp | 2 +- src/messages/layouts/MessageLayout.cpp | 7 +++---- src/singletons/Settings.hpp | 4 ++-- src/singletons/StreamerMode.cpp | 4 ++-- src/singletons/StreamerMode.hpp | 6 +++--- src/singletons/WindowManager.cpp | 2 +- src/widgets/settingspages/GeneralPage.cpp | 8 ++++---- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 362c4aa8..f530e0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - Minor: Overlay windows now inherit the global zoom level and can be zoomed independently. (#6016) - Minor: The `/watching` channel is now supported on all platforms. (#6031, #6043) - Minor: The font weight of chat messages can now be changed. (#6037) -- Minor: Messages from suspicious users can now be hidden when in streamer mode. This is enabled by default. (#6042) +- Minor: Messages from restricted users can now be hidden when in streamer mode. This is enabled by default. (#6042, #6049) - Bugfix: Fixed a potential way to escape the Lua Plugin sandbox. (#5846) - Bugfix: Fixed a crash relating to Lua HTTP. (#5800) - Bugfix: Fixed a crash that could occur on Linux and macOS when clicking "Install" from the update prompt. (#5818) diff --git a/mocks/include/mocks/DisabledStreamerMode.hpp b/mocks/include/mocks/DisabledStreamerMode.hpp index 40127faa..c9362d74 100644 --- a/mocks/include/mocks/DisabledStreamerMode.hpp +++ b/mocks/include/mocks/DisabledStreamerMode.hpp @@ -15,7 +15,7 @@ public: return false; } - bool shouldHideSuspiciousUsers() const override + bool shouldHideRestrictedUsers() const override { return false; } diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index 43547c2f..5e4bc4db 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -166,13 +166,12 @@ void MessageLayout::actuallyLayout(const MessageLayoutContext &ctx) continue; } - if (this->message_->flags.hasAny(MessageFlag::RestrictedMessage, - MessageFlag::MonitoredMessage)) + if (this->message_->flags.has(MessageFlag::RestrictedMessage)) { - if (getApp()->getStreamerMode()->shouldHideSuspiciousUsers()) + if (getApp()->getStreamerMode()->shouldHideRestrictedUsers()) { // Message is being hidden because the source is a - // restricted or monitored user + // restricted user continue; } } diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 1e303cf6..5f3a23b7 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -362,8 +362,8 @@ public: "/streamerMode/hideViewerCountAndDuration", false}; BoolSetting streamerModeHideModActions = {"/streamerMode/hideModActions", true}; - BoolSetting streamerModeHideSuspiciousUsers = { - "/streamerMode/hideSuspiciousUsers", + BoolSetting streamerModeHideRestrictedUsers = { + "/streamerMode/hideRestrictedUsers", true, }; BoolSetting streamerModeMuteMentions = {"/streamerMode/muteMentions", true}; diff --git a/src/singletons/StreamerMode.cpp b/src/singletons/StreamerMode.cpp index 7d4b594c..41c3661c 100644 --- a/src/singletons/StreamerMode.cpp +++ b/src/singletons/StreamerMode.cpp @@ -207,9 +207,9 @@ bool StreamerMode::shouldHideModActions() const return getSettings()->streamerModeHideModActions && this->isEnabled(); } -bool StreamerMode::shouldHideSuspiciousUsers() const +bool StreamerMode::shouldHideRestrictedUsers() const { - return getSettings()->streamerModeHideSuspiciousUsers && this->isEnabled(); + return getSettings()->streamerModeHideRestrictedUsers && this->isEnabled(); } void StreamerMode::start() diff --git a/src/singletons/StreamerMode.hpp b/src/singletons/StreamerMode.hpp index c759a0d6..8a56bade 100644 --- a/src/singletons/StreamerMode.hpp +++ b/src/singletons/StreamerMode.hpp @@ -23,8 +23,8 @@ public: /// Returns true if streamer mode is enabled & the settings to hide mod actions is enabled [[nodiscard]] virtual bool shouldHideModActions() const = 0; - /// Returns true if streamer mode is enabled & the settings to hide messages from suspicious users is enabled - [[nodiscard]] virtual bool shouldHideSuspiciousUsers() const = 0; + /// Returns true if streamer mode is enabled & the settings to hide messages from restricted users is enabled + [[nodiscard]] virtual bool shouldHideRestrictedUsers() const = 0; virtual void start() = 0; @@ -46,7 +46,7 @@ public: bool isEnabled() const override; bool shouldHideModActions() const override; - bool shouldHideSuspiciousUsers() const override; + bool shouldHideRestrictedUsers() const override; void start() override; diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 9bca93d3..ca8daf09 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -148,7 +148,7 @@ WindowManager::WindowManager(const Paths &paths, Settings &settings, this->forceLayoutChannelViewsListener.add( settings.streamerModeHideModActions); this->forceLayoutChannelViewsListener.add( - settings.streamerModeHideSuspiciousUsers); + settings.streamerModeHideRestrictedUsers); this->layoutChannelViewsListener.add(settings.timestampFormat); this->layoutChannelViewsListener.add(fonts.fontChanged); diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index 991062ea..59667eb9 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -733,10 +733,10 @@ void GeneralPage::initLayout(GeneralPageView &layout) "Hide moderation actions", s.streamerModeHideModActions, false, "Hide bans, timeouts, and automod messages from appearing in chat."); - SettingWidget::checkbox("Hide messages from suspicious users", - s.streamerModeHideSuspiciousUsers) - ->setTooltip("Suspicious users are users who are marked as either " - "restricted or monitored by you or Twitch's AutoMod") + SettingWidget::checkbox("Hide messages from restricted users", + s.streamerModeHideRestrictedUsers) + ->setTooltip("Restricted users can be marked by you, your moderators, " + "or Twitch's AutoMod") ->addTo(layout); layout.addCheckbox(