Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-18 09:17:58 -06:00
parent e27eedbd08 e56404be41
commit 1964a0f941
2 changed files with 11 additions and 2 deletions
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -54,7 +54,7 @@ class NotifyService < BaseService
  end

  def response_to_recipient?
-    @notification.target_status.in_reply_to_account_id == @recipient.id
+    @notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility?
  end

  def optional_non_following_and_direct?