about summary refs log tree commit diff
path: root/app/workers/pubsubhubbub
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-10 02:55:43 +0200
committerGitHub <noreply@github.com>2017-05-10 02:55:43 +0200
commit3a38322a54f0eeb3eba037a4fd61a072bda44311 (patch)
tree0e959825c95b3e0afd7fcfad2c7d435056b80c5a /app/workers/pubsubhubbub
parent29d8313b28ee5a0f6e18141028185e757035b547 (diff)
Add spec for Pubsubhubbub::DistributionWorker. PuSH-deliver public items (#2954)
to all subscribers. IDN-normalize callback URLs for subscriptions on insert.
Diffstat (limited to 'app/workers/pubsubhubbub')
-rw-r--r--app/workers/pubsubhubbub/distribution_worker.rb18
1 files changed, 12 insertions, 6 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index c0e03990a..b8f5c35e1 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -10,15 +10,21 @@ class Pubsubhubbub::DistributionWorker
 
     return if stream_entry.status&.direct_visibility?
 
-    account = stream_entry.account
-    payload = AtomSerializer.render(AtomSerializer.new.feed(account, [stream_entry]))
-    domains = account.followers_domains
+    @account = stream_entry.account
+    @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, [stream_entry]))
+    @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)
-      Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)
+    Subscription.where(account: @account).active.select('id, callback_url').find_each do |subscription|
+      next if stream_entry.hidden? && !allowed_to_receive?(subscription.callback_url)
+      Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, @payload)
     end
   rescue ActiveRecord::RecordNotFound
     true
   end
+
+  private
+
+  def allowed_to_receive?(callback_url)
+    @domains.include?(Addressable::URI.parse(callback_url).host)
+  end
 end