]> cat aescling's git repositories - mastodon.git/commitdiff
Fix “Show boosts/replies in public timelines” only affecting streaming
authorThibaut Girka <thib@sitedethib.com>
Thu, 12 Nov 2020 22:15:31 +0000 (23:15 +0100)
committerThibG <thib@sitedethib.com>
Thu, 12 Nov 2020 22:44:53 +0000 (23:44 +0100)
Fixes #1456

app/controllers/api/v1/timelines/public_controller.rb

index fbd99667c9f70d790bc614ce50a80f58a714b0f7..493fe4776a5c194882635fb25dacbdf3a57ce2bb 100644 (file)
@@ -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