tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configuration to disable private status federation over PuSH (#4582)

Browse Source
This commit is contained in:
Eugen Rochko
2017-08-24 17:51:32 +02:00
committed by GitHub
parent b01a19fe39
commit cf615abbf9
4 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/process_mentions_service.rb
View File

@ -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)

2
app/workers/pubsubhubbub/distribution_worker.rb
View File

@ -14,7 +14,7 @@ class Pubsubhubbub::DistributionWorker
@subscriptions = active_subscriptions.to_a
distribute_public!(stream_entries.reject(&:hidden?))
distribute_hidden!(stream_entries.select(&:hidden?))
distribute_hidden!(stream_entries.select(&:hidden?)) if Rails.configuration.x.use_ostatus_privacy
end
private