mastofe

commit: 7cd3de3494834abfefc405b958da9898780fcb40
parent: 082e1cbe5a6bcff291e0fe96260ca8920776a18e
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 24 Mar 2016 12:34:32 +0100

Do display top-level content on remote shared notices

Diffstat:
M
app/helpers/atom_builder_helper.rb
2
+-
M
app/models/status.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -75,7 +75,7 @@ class Status < ActiveRecord::Base
       end
     end
 
-    m
+    m.uniq
   end
 
   def ancestors