diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-12-14 01:41:13 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2021-02-16 03:33:32 +0100 |
| commit | dd512c140bee24446d1ddab901d04b51a72a2d86 (patch) | |
| tree | c1e2d1beb1058ccc395d65fe586929b4de8add55 /app/controllers/public_timelines_controller.rb | |
| parent | 9c273c2a59755a46ff3933470b02df857537a4af (diff) | |
| download | mastodon-feature-unify-uis.tar mastodon-feature-unify-uis.tar.gz mastodon-feature-unify-uis.tar.bz2 mastodon-feature-unify-uis.zip | |
Diffstat (limited to 'app/controllers/public_timelines_controller.rb')
| -rw-r--r-- | app/controllers/public_timelines_controller.rb | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/app/controllers/public_timelines_controller.rb b/app/controllers/public_timelines_controller.rb index 1332ba16c..1fcb9fbca 100644 --- a/app/controllers/public_timelines_controller.rb +++ b/app/controllers/public_timelines_controller.rb @@ -1,26 +1,18 @@ # frozen_string_literal: true class PublicTimelinesController < ApplicationController - layout 'public' + include WebAppControllerConcern before_action :authenticate_user!, if: :whitelist_mode? before_action :require_enabled! - before_action :set_body_classes - before_action :set_instance_presenter - def show; end + def show + expires_in 0, public: true if current_account.nil? + end private def require_enabled! - not_found unless Setting.timeline_preview - end - - def set_body_classes - @body_classes = 'with-modals' - end - - def set_instance_presenter - @instance_presenter = InstancePresenter.new + not_found unless user_signed_in? || Setting.timeline_preview end end |