Fix logic of block/mute bypass for mentions from moderators (mastodon…

…#31271)
nileane · Aug 19, 2024 · 9952b63 · 9952b63
1 parent 909a261
commit 9952b63
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -86,7 +86,8 @@ def response_to_recipient?
   end
 
   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
 
   def optional_non_following_and_direct?