diff --git a/app/models/concerns/relationship_cacheable.rb b/app/models/concerns/relationship_cacheable.rb index c32a8d62c6f..9aa933aa5c5 100644 --- a/app/models/concerns/relationship_cacheable.rb +++ b/app/models/concerns/relationship_cacheable.rb @@ -10,7 +10,7 @@ module RelationshipCacheable private def remove_relationship_cache - Rails.cache.delete(['relationship', account_id, target_account_id]) - Rails.cache.delete(['relationship', target_account_id, account_id]) + Rails.cache.delete(['relationships', account_id, target_account_id]) + Rails.cache.delete(['relationships', target_account_id, account_id]) end end diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index 8482ef54da4..f06aeb86741 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -114,6 +114,6 @@ class AccountRelationshipsPresenter end def relationship_cache_key(account_id) - ['relationship', @current_account_id, account_id] + ['relationships', @current_account_id, account_id] end end diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index 81274a79360..faf576c7312 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -66,10 +66,10 @@ class MoveWorker # Clear any relationship cache, since callbacks are not called Rails.cache.delete_multi(follows.flat_map do |follow| [ - ['relationship', follow.account_id, follow.target_account_id], - ['relationship', follow.target_account_id, follow.account_id], - ['relationship', follow.account_id, @target_account.id], - ['relationship', @target_account.id, follow.account_id], + ['relationships', follow.account_id, follow.target_account_id], + ['relationships', follow.target_account_id, follow.account_id], + ['relationships', follow.account_id, @target_account.id], + ['relationships', @target_account.id, follow.account_id], ] end) end