about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-04-17 10:20:49 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:22 -0500
commitcea2baf2e0af3b0c7fe1fe31cb74f94e3ad42b71 (patch)
treeee3237b6955b0167b3ccde680a684d9a44a2f291 /app
parentec5c6e7fcbcdeb8cbc8bc1e33bcd5be9d72bf17d (diff)
Limit scope of local/world TLs. Fixes the bug causing some requests to fetch the local and world timelines to time out.
Diffstat (limited to 'app')
-rw-r--r--app/models/status.rb6
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)