Fix ActivityPub and REST API queries setting cookies and preventing c…

…aching (mastodon#11539) Regression from mastodon#8657
vulpineclub · Feb 21, 2020 · 49ad6d3 · 49ad6d3
1 parent 892b9a8
commit 49ad6d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -13,6 +13,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
@@ -20,6 +20,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