Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Sanitize remote html in atom feeds, API (not just UI), use cached mention

Browse source 
relations on Status#mentions
This commit is contained in:
Eugen Rochko 2016-03-24 12:40:55 +01:00
parent 7cd3de3494
commit c8999a116e
6 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/atom_builder_helper.rb
View file

@ -137,13 +137,7 @@ module AtomBuilderHelper
def conditionally_formatted(activity)
if activity.is_a?(Status)
if activity.reblog? && activity.reblog.local?
linkify(activity.reblog)
elsif !activity.reblog? && activity.local?
linkify(activity)
else
activity.content
end
content_for_status(activity.reblog? ? activity.reblog : activity)
elsif activity.nil?
nil
else