about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-10 00:15:49 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-10 00:15:49 +0100
commitaabf884c5f6bf5c0a7cdec2c3e4fe174eeecfaec (patch)
tree9577ce64b62b3b25f955af4d9a687e4492a1f82d /app/models
parent17903c6dae9eb38ac221fb7cf86e5e3cafe465d0 (diff)
Discard misattributed remote statuses, improve timelines filter
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 41c3b0a92..08b5e2cab 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -121,6 +121,7 @@ class Status < ApplicationRecord
 
     def filter_timeline(query, account)
       blocked = Block.where(account: account).pluck(:target_account_id)
+      return query if blocked.empty?
 
       query
         .joins('LEFT OUTER JOIN statuses AS parents ON statuses.in_reply_to_id = parents.id')