Browse Source

always allow DMs from staff (#8993)

master
Quint Guvernator 5 years ago
committed by Eugen Rochko
parent
commit
f5e2e96e95
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      app/services/notify_service.rb

+ 5
- 0
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?
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


Loading…
Cancel
Save