diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:15:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:15:55 -0400 |
commit | 1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (patch) | |
tree | 852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /app/workers/pubsubhubbub/distribution_worker.rb | |
parent | eb98c99924ab810eea8a97040a82308f68c805cc (diff) | |
parent | 7004c692040d9372c187a13a21f1215f07d3a8ff (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/workers/pubsubhubbub/distribution_worker.rb')
-rw-r--r-- | app/workers/pubsubhubbub/distribution_worker.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index 82ff257af..68ca0f870 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -10,14 +10,10 @@ class Pubsubhubbub::DistributionWorker 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 + account = stream_entry.account + payload = AtomSerializer.render(AtomSerializer.new.feed(account, [stream_entry])) Subscription.where(account: account).active.select('id, callback_url').find_each do |subscription| - host = Addressable::URI.parse(subscription.callback_url).host - next if DomainBlock.blocked?(host) # || !domains.include?(host) Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) end rescue ActiveRecord::RecordNotFound |