Add UserRole#bypass_block? method for notification check (mastodon#…

…32974)
Kyutech-C3 · Nov 26, 2024 · a27bafa · a27bafa
1 parent f0855fd
commit a27bafa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
@@ -142,6 +142,10 @@ def overrides?(other_role)
     other_role.nil? || position > other_role.position
   end
 
+  def bypass_block?(role)
+    overrides?(role) && highlighted? && can?(*Flags::CATEGORIES[:moderation])
+  end
+
   def computed_permissions
     # If called on the everyone role, no further computation needed
     return permissions if everyone?

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -134,7 +134,7 @@ def message?
     end
 
     def from_staff?
-      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
+      @sender.local? && @sender.user.present? && @sender.user_role&.bypass_block?(@recipient.user_role)
     end
 
     def from_self?