mastofe

commit: 0320ea4b85adab1d5a84613df42120aebe224fab
parent: 36921be9aa6f4ef68d969ee2a1c49b63a37d4d2a
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 10 Nov 2016 21:58:22 +0100

Fix public timeline query

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

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -126,8 +126,8 @@ class Status < ApplicationRecord
       query
         .joins('LEFT OUTER JOIN statuses AS parents ON statuses.in_reply_to_id = parents.id')
         .joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.reblog_of_id = reblogs.id')
-        .where('parents.account_id NOT IN (?)', blocked)
         .where('statuses.account_id NOT IN (?)', blocked)
+        .where('(parents.id IS NULL OR parents.account_id NOT IN (?))', blocked)
         .where('(reblogs.id IS NULL OR reblogs.account_id NOT IN (?))', blocked)
     end
   end