Limit scope of local/world TLs. Fixes the bug causing some requests to fetch the local and world timelines to time out.

1 files changed, 2 insertions, 4 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index be2e93f20..cd35ca017 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -377,10 +377,8 @@ class Status < ApplicationRecord
         query = timeline_scope(local_only)
         query = query.without_replies unless Setting.show_replies_in_public_timelines
       else
-        scope = Status.curated
-        scope = scope.without_replies unless Setting.show_replies_in_public_timelines
-        query = scope.public_browsable
-          .or(scope.where(account: account.following, visibility: :private))
+        query = Status.curated.public_browsable
+        query = query.without_replies unless Setting.show_replies_in_public_timelines
       end
 
       apply_timeline_filters(query, account, local_only)