From: ThibG <thib@sitedethib.com>
Date: Fri, 13 Sep 2019 14:03:46 +0000 (+0200)
Subject: Change /api/v1/timelines/public to require auth when public preview is off (#11802)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=225edac118634b146c1bbf45f199d8a1257bcf56;p=mastodon.git

Change /api/v1/timelines/public to require auth when public preview is off (#11802)

Fixes #11289
---

diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index aabe24324..ccc10f966 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Timelines::PublicController < Api::BaseController
+  before_action :require_user!, only: [:show], if: :require_auth?
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   respond_to :json
@@ -12,6 +13,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
 
   private
 
+  def require_auth?
+    !Setting.timeline_preview
+  end
+
   def load_statuses
     cached_public_statuses
   end