cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename cache key to exclude_account_ids_for:id, adjust formatting

This commit is contained in:
Eugen Rochko 2017-04-18 01:14:02 +02:00
parent 2fd0473aa1
commit f5cd0b4956
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/block.rb
View File

@ -8,11 +8,13 @@ class Block < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id } validates :account_id, uniqueness: { scope: :target_account_id }
after_create :remove_blocking_cache after_create :remove_blocking_cache
after_destroy :remove_blocking_cache after_destroy :remove_blocking_cache
private
def remove_blocking_cache def remove_blocking_cache
Rails.cache.delete("blocked_account_ids:#{account_id}") Rails.cache.delete("exclude_account_ids_for:#{account_id}")
Rails.cache.delete("blocked_account_ids:#{target_account_id}") Rails.cache.delete("exclude_account_ids_for:#{target_account_id}")
end end
end end

6
app/models/mute.rb
View File

@ -8,10 +8,12 @@ class Mute < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id } validates :account_id, uniqueness: { scope: :target_account_id }
after_create :remove_blocking_cache after_create :remove_blocking_cache
after_destroy :remove_blocking_cache after_destroy :remove_blocking_cache
private
def remove_blocking_cache def remove_blocking_cache
Rails.cache.delete("blocked_account_ids:#{account_id}") Rails.cache.delete("exclude_account_ids_for:#{account_id}")
end end
end end

4
app/models/status.rb
View File

@ -183,9 +183,7 @@ class Status < ApplicationRecord
private private
def filter_timeline(query, account) def filter_timeline(query, account)
blocked = Rails.cache.fetch("blocked_account_ids:#{account.id}") do blocked = Rails.cache.fetch("exclude_account_ids_for:#{account.id}") { Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) }
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