about summary refs log tree commit diff
path: root/app/workers/pubsubhubbub/distribution_worker.rb
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 21:54:32 -0400
committerGitHub <noreply@github.com>2017-04-07 21:54:32 -0400
commit7b7bff04df135aa76329696fbbceee9b80a70645 (patch)
treea535a961e2af14bdc013274717b8098516cfee64 /app/workers/pubsubhubbub/distribution_worker.rb
parenta31f5765afb2598937b418cce0b5bacdf71c5ba8 (diff)
parente6596087977516270c8a805db962eb8b06e99d96 (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/workers/pubsubhubbub/distribution_worker.rb')
-rw-r--r--app/workers/pubsubhubbub/distribution_worker.rb8
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