diff options
Diffstat (limited to 'app/views/atom/user_stream.xml.ruby')
-rw-r--r-- | app/views/atom/user_stream.xml.ruby | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/app/views/atom/user_stream.xml.ruby b/app/views/atom/user_stream.xml.ruby index 2b0c0aaa0..d7e0d5843 100644 --- a/app/views/atom/user_stream.xml.ruby +++ b/app/views/atom/user_stream.xml.ruby @@ -6,12 +6,7 @@ Nokogiri::XML::Builder.new do |xml| updated_at xml, stream_updated_at author(xml) do - object_type xml, :person - uri xml, profile_url(name: @account.username) - name xml, @account.username - summary xml, @account.note - link_alternate xml, profile_url(name: @account.username) - portable_contact xml, @account + include_author xml, @account end link_alternate xml, profile_url(name: @account.username) @@ -21,29 +16,7 @@ Nokogiri::XML::Builder.new do |xml| @account.stream_entries.order('id desc').each do |stream_entry| entry(xml, false) do - unique_id xml, stream_entry.created_at, stream_entry.activity_id, stream_entry.activity_type - published_at xml, stream_entry.activity.created_at - updated_at xml, stream_entry.activity.updated_at - title xml, stream_entry.title - content xml, stream_entry.content - verb xml, stream_entry.verb - link_self xml, atom_entry_url(id: stream_entry.id) - - if stream_entry.targeted? - target(xml) do - object_type xml, stream_entry.target.object_type - simple_id xml, stream_entry.target.uri - title xml, stream_entry.target.title - summary xml, stream_entry.target.summary - link_alternate xml, stream_entry.target.uri - - if stream_entry.target.object_type == :person - portable_contact xml, stream_entry.target - end - end - else - object_type xml, stream_entry.object_type - end + include_entry xml, stream_entry end end end |