tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect filter cache key sometimes causing incorrect filters to be applied (#39698)

Browse Source
This commit is contained in:
Claire 2026-07-02 10:48:17 +02:00
parent 635764b72f
commit 94b897fdee
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/status_cache_hydrator.rb
View File

@ -131,7 +131,7 @@ class StatusCacheHydrator
def mapped_applied_custom_filter(account, status)
CustomFilter
.apply_cached_filters(CustomFilter.cached_filters_for(account), status)
.apply_cached_filters(CustomFilter.cached_filters_for(account.id), status)
.map { |filter| serialized_filter(filter) }
end

2
app/models/custom_filter.rb
View File

@ -68,6 +68,8 @@ class CustomFilter < ApplicationRecord
end
def self.cached_filters_for(account_id)
raise ArgumentError unless account_id.is_a?(String) || account_id.is_a?(Integer)
active_filters = Rails.cache.fetch("filters:v3:#{account_id}") do
filters_hash = {}