Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539)

Regression from #8657

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 058a00a21bc5ff5702f004ebeb2ec09ffdcbaf46..f153b63bbaae43127cc2f4943e8ff8b2aeaca4a5 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -9,6 +9,8 @@ class AccountsController < ApplicationController
   before_action :set_cache_headers
   before_action :set_body_classes
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   def show
     respond_to do |format|
       format.html do

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 109e38ffabbb13706535e5be4ce177e4ffcc1c63..de8fff30e04388c9235fbecfb97b683771ed030b 100644 (file)
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -14,6 +14,8 @@ class Api::BaseController < ApplicationController
 
   protect_from_forgery with: :null_session
 
+  skip_around_action :set_locale
+
   rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
     render json: { error: e.to_s }, status: 422
   end

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 0693125ab1b580b244feec3b222b4821692ab8ee..83131f484ec95c00a28c8b8262e00f4ff6077913 100644 (file)
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -18,6 +18,8 @@ class StatusesController < ApplicationController
   before_action :set_body_classes
   before_action :set_autoplay, only: :embed
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   content_security_policy only: :embed do |p|
     p.frame_ancestors(false)
   end