Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
commit
2fd0473aa1
|
@ -7,4 +7,12 @@ class Block < ApplicationRecord
|
||||||
belongs_to :target_account, class_name: 'Account', required: true
|
belongs_to :target_account, class_name: 'Account', required: true
|
||||||
|
|
||||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||||
|
|
||||||
|
after_create :remove_blocking_cache
|
||||||
|
after_destroy :remove_blocking_cache
|
||||||
|
|
||||||
|
def remove_blocking_cache
|
||||||
|
Rails.cache.delete("blocked_account_ids:#{account_id}")
|
||||||
|
Rails.cache.delete("blocked_account_ids:#{target_account_id}")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,4 +7,11 @@ class Mute < ApplicationRecord
|
||||||
belongs_to :target_account, class_name: 'Account', required: true
|
belongs_to :target_account, class_name: 'Account', required: true
|
||||||
|
|
||||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||||
|
|
||||||
|
after_create :remove_blocking_cache
|
||||||
|
after_destroy :remove_blocking_cache
|
||||||
|
|
||||||
|
def remove_blocking_cache
|
||||||
|
Rails.cache.delete("blocked_account_ids:#{account_id}")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -183,7 +183,9 @@ class Status < ApplicationRecord
|
||||||
private
|
private
|
||||||
|
|
||||||
def filter_timeline(query, account)
|
def filter_timeline(query, account)
|
||||||
blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id)
|
blocked = Rails.cache.fetch("blocked_account_ids:#{account.id}") do
|
||||||
|
Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id)
|
||||||
|
end
|
||||||
query = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty? # Only give us statuses from people we haven't blocked, or muted, or that have blocked us
|
query = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty? # Only give us statuses from people we haven't blocked, or muted, or that have blocked us
|
||||||
query = query.where('accounts.silenced = TRUE') if account.silenced? # and if we're hellbanned, only people who are also hellbanned
|
query = query.where('accounts.silenced = TRUE') if account.silenced? # and if we're hellbanned, only people who are also hellbanned
|
||||||
query
|
query
|
||||||
|
|
Reference in New Issue