OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-29 01:58:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic of block/mute bypass for mentions from moderators (#31271)

Browse source
This commit is contained in:
Claire 2024-08-07 08:52:10 +02:00
parent 29c35ef4f9
commit 0a345ad5e1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/services/notify_service.rb
View file

@ -86,7 +86,8 @@ class NotifyService < BaseService
end end
def from_staff? def from_staff?
@notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role) sender = @notification.from_account
sender.local? && sender.user.present? && sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
end end
def optional_non_following_and_direct? def optional_non_following_and_direct?