Do display top-level content on remote shared notices

2016-03-24 12:34:32 +01:00 · 2016-03-24 12:34:32 +01:00 · 7cd3de3494
commit 7cd3de3494
parent 082e1cbe5a
2 changed files with 2 additions and 2 deletions
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@ -139,7 +139,7 @@ module AtomBuilderHelper
    if activity.is_a?(Status)
      if activity.reblog? && activity.reblog.local?
        linkify(activity.reblog)
-      elsif activity.local?
+      elsif !activity.reblog? && activity.local?
        linkify(activity)
      else
        activity.content
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -75,7 +75,7 @@ class Status < ActiveRecord::Base
      end
    end

-    m
+    m.uniq
  end

  def ancestors