LenPayne
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take out private toot distribution out of PuSH again

This commit is contained in:
Eugen Rochko 2017-02-12 01:31:04 +01:00
parent 0518492158
commit db814543c0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,18 +8,13 @@ class Pubsubhubbub::DistributionWorker
def perform(stream_entry_id) def perform(stream_entry_id)
stream_entry = StreamEntry.find(stream_entry_id) stream_entry = StreamEntry.find(stream_entry_id)
# Most hidden stream entries should not be PuSHed, return if stream_entry.hidden?
# but statuses need to be distributed to trusted
# followers even when they are hidden
return if stream_entry.hidden? && stream_entry.activity_type != 'Status'
account = stream_entry.account account = stream_entry.account
renderer = AccountsController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https) renderer = AccountsController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https)
payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom]) payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom])
domains = account.followers_domains
Subscription.where(account: account).active.select('id, callback_url').find_each do |subscription| Subscription.where(account: account).active.select('id').find_each do |subscription|
next unless domains.include?(Addressable::URI.parse(subscription.callback_url).host)
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound