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

This commit is contained in:
Claire authored and GitHub committed 2024-08-07 06:52:10 +00:00
1 parent c8b9e60ec1
commit 719cabe024
2 files changed
+35 -1

No files matched your search

+1 -1
View File
@@ -48,7 +48,7 @@ class NotifyService < BaseService
end
def from_staff?
@sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
@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
def from_self?