Do display top-level content on remote shared notices

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

diff --git a/app/models/status.rb b/app/models/status.rb
index 68f4adf34490247d496e75c87cab5bb3e56e5f72..2462d6b7d3ad964e83bda73bcc365b9c442ea7a8 100644 (file)
--- 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