diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-12 17:42:53 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:39:08 -0600 |
| commit | f60e0b62f4e5300645f235983e5b75bcf16b370d (patch) | |
| tree | 0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | ec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff) | |
| parent | 265b26489a9214a6c98a4dfa88f08ce490211ebc (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
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 fbd99667c..493fe4776 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -38,7 +38,9 @@ class Api::V1::Timelines::PublicController < Api::BaseController local: truthy_param?(:local), remote: truthy_param?(:remote), only_media: truthy_param?(:only_media), - allow_local_only: truthy_param?(:allow_local_only) + allow_local_only: truthy_param?(:allow_local_only), + with_replies: Setting.show_replies_in_public_timelines, + with_reblogs: Setting.show_reblogs_in_public_timelines, ) end |