hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always allow DMs from staff (#8993)

signup-info-prompt
Quint Guvernator 2018-10-16 13:55:05 -04:00 committed by Eugen Rochko
parent fe9815a462
commit f5e2e96e95
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/notify_service.rb
View File

@ -59,9 +59,14 @@ class NotifyService < BaseService
@notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility? @notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility?
end 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? def optional_non_following_and_direct?
direct_message? && direct_message? &&
@recipient.user.settings.interactions['must_be_following_dm'] && @recipient.user.settings.interactions['must_be_following_dm'] &&
!from_staff? &&
!following_sender? && !following_sender? &&
!response_to_recipient? !response_to_recipient?
end end