Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor: AutoMod term management messages are now hidden in Streamer Mode. #4758

Merged
merged 8 commits into from
Aug 12, 2023
Merged

Minor: AutoMod term management messages are now hidden in Streamer Mode. #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
997592c
Block automod add/remove blocked/permitted term messages in streamer …
Mm2PL Aug 7, 2023
d34b5a3
changelog
Mm2PL Aug 7, 2023
41d4303
Move all the checks into one
Mm2PL Aug 7, 2023
ff41180
Update GeneralPage to include this
Mm2PL Aug 7, 2023
9d19015
Update condition
Mm2PL Aug 7, 2023
d354f42
Update changelog entry
pajlada Aug 12, 2023
1164b81
oxford comma
pajlada Aug 12, 2023
fbb6d0d
Merge remote-tracking branch 'origin/master' into chore/hide_automod_…
pajlada Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions src/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 1 addition & 0 deletions src/providers/twitch/PubSubManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "util/DebugCount.hpp"
#include "util/Helpers.hpp"
#include "util/RapidjsonHelpers.hpp"
#include "util/StreamerMode.hpp"

#include <QJsonArray>

Expand Down
5 changes: 3 additions & 2 deletions src/widgets/settingspages/GeneralPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading