diff options
| author | Matt Jankowski <matt@jankowski.online> | 2023-03-25 19:40:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-26 00:40:01 +0100 |
| commit | 0663803348440cc4b66f061801259dc10c0ad83d (patch) | |
| tree | ecf332d6d7ed6240d65bd42be365b916dd42a340 /app/controllers | |
| parent | b9e34ef098026eaa451f42927ce72cb5ba48f413 (diff) | |
Move link header setting to after_action (#24251)
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/account_controller_concern.rb | 3 | ||||
| -rw-r--r-- | app/controllers/statuses_controller.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb index 2f7d84df0..e9cff22ca 100644 --- a/app/controllers/concerns/account_controller_concern.rb +++ b/app/controllers/concerns/account_controller_concern.rb @@ -10,7 +10,8 @@ module AccountControllerConcern included do before_action :set_instance_presenter - before_action :set_link_headers, if: -> { request.format.nil? || request.format == :html } + + after_action :set_link_headers, if: -> { request.format.nil? || request.format == :html } end private diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index fcb3cd4fa..d369cd8e6 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -9,11 +9,12 @@ class StatusesController < ApplicationController before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? } before_action :set_status before_action :set_instance_presenter - before_action :set_link_headers before_action :redirect_to_original, only: :show before_action :set_cache_headers before_action :set_body_classes, only: :embed + after_action :set_link_headers + skip_around_action :set_locale, if: -> { request.format == :json } skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode? |