From 0190aac240fd804180a56b5fe174526a9e4c3f6d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 22 Jun 2017 02:38:50 +0200 Subject: Fix regression from #3842 (#3892) * Fix regression from #3842 Simplify the query by omitting all direct statuses. Private statuses are allowed because they are from accounts we are following (so by definition) Resolves #3887 (alternative) * Adjust test --- app/models/status.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'app') diff --git a/app/models/status.rb b/app/models/status.rb index 544d2e005..791d96df1 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -131,15 +131,7 @@ class Status < ApplicationRecord end def as_home_timeline(account) - # 'references' is a workaround for the following issue: - # Inconsistent results with #or in ActiveRecord::Relation with respect to documentation Issue #24055 rails/rails - # https://github.com/rails/rails/issues/24055 - references(:mentions) - .where.not(visibility: :direct) - .or(where(mentions: { account: account })) - .where(follows: { account_id: account }) - .or(references(:mentions, :follows).where(account: account)) - .left_outer_joins(account: :followers).left_outer_joins(:mentions).group(:id) + where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private]) end def as_public_timeline(account = nil, local_only = false) -- cgit