From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 12 Nov 2020 22:15:31 +0000 (+0100)
Subject: Fix “Show boosts/replies in public timelines” only affecting streaming
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=265b26489a9214a6c98a4dfa88f08ce490211ebc;p=mastodon.git

Fix “Show boosts/replies in public timelines” only affecting streaming

Fixes #1456
---

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