Fix logic of block/mute bypass for mentions from moderators #31271
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ThisIsMissEm
reviewed
Aug 2, 2024
renchap
approved these changes
Aug 6, 2024
ClearlyClaire
added a commit
that referenced
this pull request
Aug 14, 2024
ClearlyClaire
added a commit
that referenced
this pull request
Aug 16, 2024
kmycode
pushed a commit
to kmycode/mastodon
that referenced
this pull request
Aug 16, 2024
nileane
pushed a commit
to nileane/mastodon
that referenced
this pull request
Aug 19, 2024
justinwritescode
pushed a commit
to justinwritescode/mastodon
that referenced
this pull request
Sep 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Early on, it has been decided that mentions from local moderators would be exempt from block/mute checks.
However, that is not extremely well communicated, and it is possible that moderators don't know about this and may accidentally expose their moderator status by messaging someone who has muted or blocked them.
This PR changes it so this exemption only applies if the sender's role is public (
highlighted) and they have actual moderation permissions.