From 9e0bd72434be6692a4e5331324a67fd67d0222c9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 23 Dec 2016 01:13:16 +0100 Subject: [PATCH] Fix account timelines bug --- app/models/status.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index 033ae05291..dc7fc60d72 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -31,6 +31,7 @@ class Status < ApplicationRecord scope :remote, -> { where.not(uri: nil) } scope :local, -> { where(uri: nil) } + scope :permitted_for, ->(target_account, account) { account&.id == target_account.id || account&.following?(target_account) ? where('1=1') : where.not(visibility: :private) } cache_associated :account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account @@ -128,14 +129,6 @@ class Status < ApplicationRecord select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h end - def permitted_for(target_account, account) - if account&.id == target_account.id || account&.following?(target_account) - self - else - where.not(visibility: :private) - end - end - def reload_stale_associations!(cached_items) account_ids = []