FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fixes #11289
This commit is contained in:
ThibG 2019-09-13 16:03:46 +02:00 committed by Eugen Rochko
parent 4e1b742cb2
commit 225edac118
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/v1/timelines/public_controller.rb
View File

@ -1,6 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::V1::Timelines::PublicController < Api::BaseController class Api::V1::Timelines::PublicController < Api::BaseController
before_action :require_user!, only: [:show], if: :require_auth?
after_action :insert_pagination_headers, unless: -> { @statuses.empty? } after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
respond_to :json respond_to :json
@ -12,6 +13,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
private private
def require_auth?
!Setting.timeline_preview
end
def load_statuses def load_statuses
cached_public_statuses cached_public_statuses
end end