Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Batched remove status service (#3735)

Browse source 
* Make Pubsubhubbub::DistributionWorker handle both single stream entry
arguments, as well as arrays of stream entries

* Add BatchedRemoveStatusService, make SuspendAccountService use it

* Improve method names

* Add test

* Add more tests

* Use PuSH payloads of 100 to have a clear mapping of
1000 input statuses -> 10 PuSH payloads

It was nice while it lasted
This commit is contained in:
Eugen Rochko 2017-06-14 18:01:35 +02:00 • committed by GitHub
parent 4a618908e8
commit e17c2e5da5
5 changed files with 216 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,25 +5,45 @@ class Pubsubhubbub::DistributionWorker
sidekiq_options queue: 'push'
def perform(stream_entry_id)
stream_entry = StreamEntry.find(stream_entry_id)
def perform(stream_entry_ids)
stream_entries = StreamEntry.where(id: stream_entry_ids).includes(:status).reject { |e| e.status&.direct_visibility? }
return if stream_entry.status&.direct_visibility?
return if stream_entries.empty?
@account = stream_entry.account
@payload = AtomSerializer.render(AtomSerializer.new.feed(@account, [stream_entry]))
@domains = @account.followers_domains
@account = stream_entries.first.account
@subscriptions = active_subscriptions.to_a
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
distribute_public!(stream_entries.reject(&:hidden?))
distribute_hidden!(stream_entries.reject { |s| !s.hidden? })
end
private
def distribute_public!(stream_entries)
return if stream_entries.empty?
@payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription|
[subscription.id, @payload]
end
end
def distribute_hidden!(stream_entries)
return if stream_entries.empty?
@payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
@domains = @account.followers_domains
Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url) }) do |subscription|
[subscription.id, @payload]
end
end
def active_subscriptions
Subscription.where(account: @account).active.select('id, callback_url')
end
def allowed_to_receive?(callback_url)
@domains.include?(Addressable::URI.parse(callback_url).host)
end