diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-07 05:56:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 05:56:56 +0200 |
| commit | 6d6a429af8fe4bd92ed497f401676353fdc603e0 (patch) | |
| tree | b8b1e8d88c01034b7c7ca9320ae4e9235e4b8b2a /app/services/concerns | |
| parent | 31597fd37717db79edb69a64c97b1dca2f9a8a08 (diff) | |
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
Diffstat (limited to 'app/services/concerns')
| -rw-r--r-- | app/services/concerns/stream_entry_renderer.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/concerns/stream_entry_renderer.rb b/app/services/concerns/stream_entry_renderer.rb index a4255daead0..ef176d8a662 100644 --- a/app/services/concerns/stream_entry_renderer.rb +++ b/app/services/concerns/stream_entry_renderer.rb @@ -2,7 +2,6 @@ module StreamEntryRenderer def stream_entry_to_xml(stream_entry) - renderer = StreamEntriesController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https) - renderer.render(:show, assigns: { stream_entry: stream_entry }, formats: [:atom]) + AtomSerializer.render(AtomSerializer.new.entry(stream_entry, true)) end end |