diff options
| author | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
| commit | 73f4af117fc5b5e4ee3337d634f5e589a9353644 (patch) | |
| tree | 62b0443573ba5038fd45aa14d4243dfc832c060a /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | 849e2bc4ca11892e701835a4696904d78b1ad325 (diff) | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1/timelines/public_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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 |