From 1e353910757e3d43eae5001e38774151259fa3ee Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Sat, 12 Aug 2023 18:16:30 +0200 Subject: [PATCH] Hide AutoMod term management messages in Streamer Mode. (#4758) Co-authored-by: Rasmus Karlsson --- CHANGELOG.md | 1 + src/Application.cpp | 6 ++++++ src/providers/twitch/PubSubManager.cpp | 1 + src/widgets/settingspages/GeneralPage.cpp | 5 +++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd650136..4129236a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unversioned +- Major: AutoMod term management messages (e.g. testaccount added "noob" as a blocked term on AutoMod.) are now hidden in Streamer Mode if you have the "Hide moderation actions" setting enabled. (#4758) - Minor: Message input is now focused when clicking on emotes. (#4719) - Minor: Changed viewer list to chatter list to more match Twitch's terminology. (#4732) - Minor: Nicknames are now taken into consideration when searching for messages. (#4663, #4742) diff --git a/src/Application.cpp b/src/Application.cpp index 12333c71..39f4ebf7 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -523,6 +523,12 @@ void Application::initPubSub() this->twitch->pubsub->signals_.moderation.automodUserMessage.connect( [&](const auto &action) { + // This condition has been set up to execute isInStreamerMode() as the last thing + // as it could end up being expensive. + if (getSettings()->streamerModeHideModActions && isInStreamerMode()) + { + return; + } auto chan = this->twitch->getChannelOrEmptyByID(action.roomID); if (chan->isEmpty()) diff --git a/src/providers/twitch/PubSubManager.cpp b/src/providers/twitch/PubSubManager.cpp index 644e494c..4094200f 100644 --- a/src/providers/twitch/PubSubManager.cpp +++ b/src/providers/twitch/PubSubManager.cpp @@ -10,6 +10,7 @@ #include "util/DebugCount.hpp" #include "util/Helpers.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/StreamerMode.hpp" #include diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index c6f78ac1..08d30a63 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -596,8 +596,9 @@ void GeneralPage::initLayout(GeneralPageView &layout) layout.addCheckbox( "Hide viewer count and stream length while hovering over split header", s.streamerModeHideViewerCountAndDuration); - layout.addCheckbox("Hide moderation actions", s.streamerModeHideModActions, - false, "Hide bans & timeouts from appearing in chat."); + layout.addCheckbox( + "Hide moderation actions", s.streamerModeHideModActions, false, + "Hide bans, timeouts, and automod messages from appearing in chat."); layout.addCheckbox("Mute mention sounds", s.streamerModeMuteMentions, false, "Mute your ping sound from playing."); layout.addCheckbox(