Skip to content
Snippets Groups Projects
Commit f5e2e96e authored by Quint Guvernator's avatar Quint Guvernator Committed by Eugen Rochko
Browse files

always allow DMs from staff (#8993)

parent fe9815a4
No related branches found
No related tags found
No related merge requests found
......@@ -59,9 +59,14 @@ class NotifyService < BaseService
@notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility?
end
def from_staff?
@notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user.staff?
end
def optional_non_following_and_direct?
direct_message? &&
@recipient.user.settings.interactions['must_be_following_dm'] &&
!from_staff? &&
!following_sender? &&
!response_to_recipient?
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment