diff options
| -rw-r--r-- | app/workers/pubsubhubbub/distribution_worker.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index 4576dc4a2..d5437bf6b 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -8,18 +8,13 @@ class Pubsubhubbub::DistributionWorker def perform(stream_entry_id) stream_entry = StreamEntry.find(stream_entry_id) - # Most hidden stream entries should not be PuSHed, - # but statuses need to be distributed to trusted - # followers even when they are hidden - return if stream_entry.hidden? && stream_entry.activity_type != 'Status' + return if stream_entry.hidden? account = stream_entry.account 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]) - domains = account.followers_domains - Subscription.where(account: account).active.select('id, callback_url').find_each do |subscription| - next unless domains.include?(Addressable::URI.parse(subscription.callback_url).host) + Subscription.where(account: account).active.select('id').find_each do |subscription| Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) end rescue ActiveRecord::RecordNotFound |