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

relations on Status#mentions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dad7ed349a2f36de4828fc0fca3a2d008debd3d0..04eec89df488f8b89b551cfe0f1dcc34b5300bf2 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -12,6 +12,14 @@ module ApplicationHelper
     id.start_with?("tag:#{Rails.configuration.x.local_domain}")
   end
 
+  def content_for_status(actual_status)
+    if actual_status.local?
+      linkify(actual_status)
+    else
+      sanitize(actual_status.content, tags: %w(a br p), attributes: %w(href rel))
+    end
+  end
+
   def linkify(status)
     mention_hash = {}
     status.mentions.each { |m| mention_hash[m.acct] = m }

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index 74c87daaadeb6195281846aa2a89bff303518e03..51ab4da16e6908b519da5a7564bbce03d71ccf6a 100644 (file)
--- 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

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 28fc41ed524ee6359f61381ba863ecd859f910f4..b044e8a6115c325f5daf06de044cbb6b50b4fd1c 100644 (file)
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -27,12 +27,4 @@ module StreamEntriesHelper
   def favourited_by_me_class(status)
     user_signed_in? && current_user.account.favourited?(status) ? 'favourited' : ''
   end
-
-  def content_for_status(actual_status)
-    if actual_status.local?
-      linkify(actual_status)
-    else
-      sanitize(actual_status.content, tags: %w(a br p), attributes: %w(href rel))
-    end
-  end
 end

diff --git a/app/models/status.rb b/app/models/status.rb
index 2462d6b7d3ad964e83bda73bcc365b9c442ea7a8..b1965f17653a48fe6be73e9aafbe251f9ded14e1 100644 (file)
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -60,22 +60,15 @@ class Status < ActiveRecord::Base
   end
 
   def mentions
-    m = []
-
-    m << thread.account if reply?
-    m << reblog.account if reblog?
-
-    unless reblog?
-      self.text.scan(Account::MENTION_RE).each do |match|
-        uri = match.first
-        username, domain = uri.split('@')
-        account = Account.find_by(username: username, domain: domain)
-
-        m << account unless account.nil?
-      end
+    if @mentions.nil?
+      @mentions = []
+      @mentions << thread.account if reply?
+      @mentions << reblog.account if reblog?
+      self.mentioned_accounts.each { |mention| @mentions << mention.account } unless reblog?
+      @mentions = @mentions.uniq
     end
 
-    m.uniq
+    @mentions
   end
 
   def ancestors

diff --git a/app/views/api/statuses/show.rabl b/app/views/api/statuses/show.rabl
index 6c4063b80ce729213100d5816a2c6594eeb554ba..b4a73f9a6e32f55a0b8a6f117a8658ea0c781e0d 100644 (file)
--- a/app/views/api/statuses/show.rabl
+++ b/app/views/api/statuses/show.rabl
@@ -2,7 +2,7 @@ object @status
 attributes :id, :created_at, :in_reply_to_id
 
 node(:uri)              { |status| uri_for_target(status) }
-node(:content)          { |status| status.local? ? linkify(status) : status.content }
+node(:content)          { |status| content_for_status(status) }
 node(:url)              { |status| url_for_target(status) }
 node(:reblogs_count)    { |status| status.reblogs_count }
 node(:favourites_count) { |status| status.favourites_count }

diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 13c5fa3d10fc1d3d4af791e66e92456895aef940..2bf2c744f20c6cc824b2f9a500f9f6ed9001ca70 100644 (file)
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Status, type: :model do
     end
 
     it 'returns mentioned accounts' do
-      subject.text = 'Hello @bob!'
+      subject.mentioned_accounts.create!(account: bob)
       expect(subject.mentions).to include bob
     end