From aabf884c5f6bf5c0a7cdec2c3e4fe174eeecfaec Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 10 Nov 2016 00:15:49 +0100
Subject: Discard misattributed remote statuses, improve timelines filter

---
 app/models/status.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models/status.rb')

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')
-- 
cgit