mastofe

commit: a782e3b39d2e979f1b246a058fb45c75b9a10141
parent: 53deeeca018c093392b2962ddb6343cffe6d97d2
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 17 Oct 2016 01:59:34 +0200

Actually fix public timeline

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
@@ -86,7 +86,7 @@ class Status < ApplicationRecord
   end
 
   def self.as_public_timeline(account)
-    joins('LEFT OUTER JOIN statuses AS reblogs ON reblogs.id = statuses.reblog_of_id').where('reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id).with_includes.with_counters
+    joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.reblog_of_id = reblogs.id').where('(reblogs.account_id IS NULL OR reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id).with_includes.with_counters
   end
 
   def self.favourites_map(status_ids, account_id)