Merge commit 'f9a929ed5c' into kb-draft-5.23-lts

This commit is contained in:
KMY 2024-08-19 18:42:48 +09:00
commit 8bc6f3c73c
5 changed files with 23 additions and 6 deletions

View file

@ -89,7 +89,7 @@ class NotifyService < BaseService
def from_staff?
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])
sender.local? && sender.user.present? && sender.user_role&.overrides?(@recipient.user_role) && sender.user_role&.highlighted? && sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation].map(&:to_sym))
end
def optional_non_following_and_direct?