From f5e2e96e958e3f9011da932b84af00ae7cefd561 Mon Sep 17 00:00:00 2001 From: Quint Guvernator Date: Tue, 16 Oct 2018 13:55:05 -0400 Subject: [PATCH] always allow DMs from staff (#8993) --- app/services/notify_service.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 63bf8f17a..49022a844 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -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