Commit 4fce6826 authored by Jonne Haß's avatar Jonne Haß

Merge pull request #4834 from Faldrian/atomfeedtohtml

atom-feed content changed to html, use better post-title extractor
parents c3c2129e da0b3055
......@@ -17,6 +17,7 @@
* Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)
* Do not add a space after adding a mention [#4767](https://github.com/diaspora/diaspora/issues/4767)
* Fix active user statistics by saving a last seen timestamp for users [#4734](https://github.com/diaspora/diaspora/issues/4734)
* Render HTML in atom user feed [#4835](https://github.com/diaspora/diaspora/pull/4835)
## Features
* You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
......
......@@ -32,8 +32,8 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
feed.entry post, :url => "#{@user.url}p/#{post.id}",
:id => "#{@user.url}p/#{post.id}" do |entry|
entry.title truncate(post.formatted_message(:plain_text => true), :length => 50)
entry.content auto_link(post.formatted_message(:plain_text => true)), :type => 'html'
entry.title post_page_title(post)
entry.content markdownify(post), :type => 'html'
entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post'
entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note'
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment