From a782e3b39d2e979f1b246a058fb45c75b9a10141 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 17 Oct 2016 01:59:34 +0200 Subject: [PATCH] Actually fix public timeline --- app/models/status.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/status.rb b/app/models/status.rb index f2935fea..8b7c9c82 100644 --- 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)