about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-02 22:29:19 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-02 22:29:19 +0100
commit4b357ecf98f373f5ed31c71ecc1a79d23572cd00 (patch)
treeb0c81653896add9880f17738b17738e42deb7a88 /app/lib
parentd427df4a8ae16809b068aca8c65006de2ccbd27e (diff)
Fix subtle bugs, new icon button
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/feed_manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 46a105124..0b04ad7ff 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -61,7 +61,7 @@ class FeedManager
 
   # Filter status out of the home feed if it is a reply to someone the user doesn't follow
   def filter_from_home?(status, receiver)
-    replied_to_user = status.reply? ? status.thread.account : nil
+    replied_to_user = status.reply? ? status.thread.try(:account) : nil
     (status.reply? && !(receiver.id == replied_to_user.id || replied_to_user.id == status.account_id || receiver.following?(replied_to_user))) || (status.reblog? && receiver.blocking?(status.reblog.account))
   end