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

relations on Status#mentions
2016-03-24 12:40:55 +01:00
parent 7cd3de3494
commit c8999a116e
6 changed files with 18 additions and 31 deletions
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@ -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