about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-11-12 23:15:31 +0100
committerThibG <thib@sitedethib.com>2020-11-12 23:44:53 +0100
commit265b26489a9214a6c98a4dfa88f08ce490211ebc (patch)
treef82776260213ee4ffe658b006cd32ff33de9ce4e /app/controllers
parent6c05db70faed7dbe075a04129fe26793a241124a (diff)
Fix “Show boosts/replies in public timelines” only affecting streaming
Fixes #1456
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/timelines/public_controller.rb4
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