Fix subscriptions:clear task, refactor feeds, refactor streamable activites

and atom feed generation to some extent, as well as the way mentions are
stored

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb
index 35eab1df0..2972d94f6 100644
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -41,7 +41,7 @@ class StreamEntry < ActiveRecord::Base
   end
 
   def mentions
-    orphaned? ? [] : self.activity.mentions
+    self.activity.respond_to?(:mentions) ? self.activity.mentions.map { |x| x.account } : []
   end
 
   private