diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
| commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/workers/pubsubhubbub/distribution_worker.rb | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) | |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/workers/pubsubhubbub/distribution_worker.rb')
| -rw-r--r-- | app/workers/pubsubhubbub/distribution_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index 7592354cc..9c1fa76cb 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -22,7 +22,7 @@ class Pubsubhubbub::DistributionWorker def distribute_public!(stream_entries) return if stream_entries.empty? - @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries)) + @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries)) Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription| [subscription.id, @payload] @@ -32,7 +32,7 @@ class Pubsubhubbub::DistributionWorker def distribute_hidden!(stream_entries) return if stream_entries.empty? - @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries)) + @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries)) @domains = @account.followers.domains Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription| |