mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 21:15:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)

Browse Source
This commit is contained in:
Claire 2023-04-26 11:42:47 +02:00 committed by GitHub
parent 62ab7506d6
commit b0bf6216e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/v1/instances/domain_blocks_controller.rb
View File

@ -6,10 +6,15 @@ class Api::V1::Instances::DomainBlocksController < Api::BaseController
before_action :require_enabled_api! before_action :require_enabled_api!
before_action :set_domain_blocks before_action :set_domain_blocks
vary_by '' vary_by '', if: -> { Setting.show_domain_blocks == 'all' }
def index def index
cache_even_if_authenticated! if Setting.show_domain_blocks == 'all'
cache_even_if_authenticated!
else
cache_if_unauthenticated!
end
render json: @domain_blocks, each_serializer: REST::DomainBlockSerializer, with_comment: (Setting.show_domain_blocks_rationale == 'all' || (Setting.show_domain_blocks_rationale == 'users' && user_signed_in?)) render json: @domain_blocks, each_serializer: REST::DomainBlockSerializer, with_comment: (Setting.show_domain_blocks_rationale == 'all' || (Setting.show_domain_blocks_rationale == 'users' && user_signed_in?))
end end

4
app/controllers/concerns/cache_concern.rb
View File

@ -156,8 +156,8 @@ module CacheConcern
end end
class_methods do class_methods do
def vary_by(value) def vary_by(value, **kwargs)
before_action do |controller| before_action(**kwargs) do |controller|
response.headers['Vary'] = value.respond_to?(:call) ? controller.instance_exec(&value) : value response.headers['Vary'] = value.respond_to?(:call) ? controller.instance_exec(&value) : value
end end
end end