about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2020-07-27 10:28:10 -0500
committerStarfall <us@starfall.systems>2020-07-27 10:28:10 -0500
commit470aa366b8e58a3adf4e23486e69639b31e41f8c (patch)
tree5814b148f88fbff7dfbf15091a4b05cd9d461709 /app/controllers
parente4a39e9097aaa5f71eb807068eb31b45b2403ff3 (diff)
parentab967cf5a0980934a68a4a4852ad25d10eec778e (diff)
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/timelines/public_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 2f9f88251..b449bcadf 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -29,7 +29,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
       params_slice(:max_id, :since_id, :min_id)
     )
 
-    statuses = statuses.not_local_only unless truthy_param?(:allow_local_only)
+    statuses = statuses.not_local_only unless truthy_param?(:local) || truthy_param?(:allow_local_only)
 
     if truthy_param?(:only_media)
       # `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.