From: ThibG <thib@sitedethib.com>
Date: Mon, 12 Aug 2019 20:26:07 +0000 (+0200)
Subject: Fix more ActivityPub queries setting cookies and preventing caching (#11557)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5f63339744eecd75b1065135559ddbe688636be1;p=mastodon.git

Fix more ActivityPub queries setting cookies and preventing caching (#11557)
---

diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 6e873de5b..892c51cf4 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -7,6 +7,8 @@ class FollowerAccountsController < ApplicationController
   before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   def index
     respond_to do |format|
       format.html do
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 07d62f7dd..653d9a486 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -7,6 +7,8 @@ class FollowingAccountsController < ApplicationController
   before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   def index
     respond_to do |format|
       format.html do