Skip to content

Commit

Permalink
Make single deletion messages for moderators obey the setting (#3121)
Browse files Browse the repository at this point in the history
Co-authored-by: ALazyMeme <[email protected]>
Co-authored-by: pajlada <[email protected]>
  • Loading branch information
3 people authored Aug 8, 2021
1 parent a216e11 commit b3bb7e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Minor: Remove TwitchEmotes.com attribution and the open/copy options when right-clicking a Twitch Emote. (#2214, #3136)
- Minor: Strip leading @ and trailing , from username in /user and /usercard commands. (#3143)
- Minor: Display a system message when reloading subscription emotes to match BTTV/FFZ behavior (#3135)
- Bugfix: Notifications for moderators about other moderators deleting messages can now be disabled. (#3121)
- Bugfix: Moderation mode and active filters are now preserved when opening a split as a popup. (#3113, #3130)
- Bugfix: Fixed a bug that caused all badge highlights to use the same color. (#3132, #3134)
- Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
Expand Down
2 changes: 1 addition & 1 deletion src/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void Application::initPubsub()
auto chan =
this->twitch.server->getChannelOrEmptyByID(action.roomID);

if (chan->isEmpty())
if (chan->isEmpty() || getSettings()->hideDeletionActions)
{
return;
}
Expand Down

0 comments on commit b3bb7e2

Please sign in to comment.