Fix account timelines bug

diff --git a/app/models/status.rb b/app/models/status.rb
index 033ae05291fe6e3af8d6e8cd2806d1d11bbdfab0..dc7fc60d72b37e9844109a26bbc9f70c7a587e0f 100644 (file)
--- 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 = []