vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix accidental distribution of hidden stream entries to PuSH subscribers

Browse source
This commit is contained in:
Eugen Rochko 2017-01-03 00:44:23 +01:00
parent f79ba2de83
commit 86be6d48c9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/workers/pubsubhubbub/distribution_worker.rb
View file

@ -7,9 +7,12 @@ class Pubsubhubbub::DistributionWorker
def perform(stream_entry_id) def perform(stream_entry_id)
stream_entry = StreamEntry.find(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) return if stream_entry.hidden?
payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom])
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| Subscription.where(account: account).active.select('id').find_each do |subscription|
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)