diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-15 14:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 14:45:24 +0200 |
| commit | 221bb05cf8d30d7912fd1f860af2552ff7914fd2 (patch) | |
| tree | 88ac4e45536fe772a1c47bdf6df27c6ad19a016f /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | c7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff) | |
| parent | b83e2df6b59ccd7cbe8f9145e06b75547dc1101a (diff) | |
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |