about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-24 17:51:32 +0200
committerGitHub <noreply@github.com>2017-08-24 17:51:32 +0200
commitcf615abbf9323f3b73681306090de48f9e13a6b9 (patch)
tree619d0fd305c3e75649e9e676d8e343d08e4515b6 /app/services
parentb01a19fe392e0dd16d6b3da3f0b56369f7837cc9 (diff)
Add configuration to disable private status federation over PuSH (#4582)
Diffstat (limited to 'app/services')
-rw-r--r--app/services/process_mentions_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 407fa8c18..2b8a77147 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -39,7 +39,7 @@ class ProcessMentionsService < BaseService
 
     if mentioned_account.local?
       NotifyService.new.call(mentioned_account, mention)
-    elsif mentioned_account.ostatus?
+    elsif mentioned_account.ostatus? && (Rails.configuration.x.use_ostatus_privacy || !status.stream_entry.hidden?)
       NotificationWorker.perform_async(stream_entry_to_xml(status.stream_entry), status.account_id, mentioned_account.id)
     elsif mentioned_account.activitypub?
       ActivityPub::DeliveryWorker.perform_async(build_json(mention.status), mention.status.account_id, mentioned_account.inbox_url)