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 22:49:14 -0400
committerGitHub <noreply@github.com>2017-04-07 22:49:14 -0400
commitb67b60fec3adecffef544924a7776cce9b0a2633 (patch)
treeb592548a0a8cc6e9f1cbdf91df04e197503c070f /app/workers/pubsubhubbub/distribution_worker.rb
parentacf6436a993b514aa2fffffb8a03d3718c5a49a0 (diff)
parentcc16fa75137586dff8eb1ef4e508aed81bf21718 (diff)
Merge branch 'master' into patch-2
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