diff options
author | ThibG <thib@sitedethib.com> | 2020-07-07 19:58:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 19:58:12 +0200 |
commit | 4acb7efb4ba43ec7706e4d8edfe30097b541c909 (patch) | |
tree | f07405be0aa8f31fcb5abb885b6a1eeaafaba8fd /app/controllers/api/v1/timelines/public_controller.rb | |
parent | 64b6c20676f320686c58e321b674cba757e40905 (diff) | |
parent | 13db302f6eca9e3a40eb92fe9dc358e4a5dda432 (diff) |
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option
Add option to show local-only toots in public timeline
Diffstat (limited to 'app/controllers/api/v1/timelines/public_controller.rb')
-rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index c6e7854d9..2f9f88251 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -29,6 +29,8 @@ 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) + 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. status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id) @@ -47,7 +49,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController end def pagination_params(core_params) - params.slice(:local, :remote, :limit, :only_media).permit(:local, :remote, :limit, :only_media).merge(core_params) + params.slice(:local, :remote, :limit, :only_media, :allow_local_only).permit(:local, :remote, :limit, :only_media, :allow_local_only).merge(core_params) end def next_path |