commit: 86be6d48c9cf56cfe5e273169126729d097fe67e
parent: f79ba2de83af5d9a1a94415c3ca38a7e7d6f2cfc
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 3 Jan 2017 00:44:23 +0100
Fix accidental distribution of hidden stream entries to PuSH subscribers
Diffstat:
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -7,9 +7,12 @@ class Pubsubhubbub::DistributionWorker
def perform(stream_entry_id)
stream_entry = StreamEntry.find(stream_entry_id)
- 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])
+
+ 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])
Subscription.where(account: account).active.select('id').find_each do |subscription|
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)