diff options
| -rw-r--r-- | app/models/block.rb | 8 | ||||
| -rw-r--r-- | app/models/mute.rb | 6 | ||||
| -rw-r--r-- | app/models/status.rb | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/models/block.rb b/app/models/block.rb index ac1e1b0b1..c978b2200 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -8,11 +8,13 @@ class Block < ApplicationRecord validates :account_id, uniqueness: { scope: :target_account_id } - after_create :remove_blocking_cache + after_create :remove_blocking_cache after_destroy :remove_blocking_cache + private + def remove_blocking_cache - Rails.cache.delete("blocked_account_ids:#{account_id}") - Rails.cache.delete("blocked_account_ids:#{target_account_id}") + Rails.cache.delete("exclude_account_ids_for:#{account_id}") + Rails.cache.delete("exclude_account_ids_for:#{target_account_id}") end end diff --git a/app/models/mute.rb b/app/models/mute.rb index 0cf17be4f..d0de62ed5 100644 --- a/app/models/mute.rb +++ b/app/models/mute.rb @@ -8,10 +8,12 @@ class Mute < ApplicationRecord validates :account_id, uniqueness: { scope: :target_account_id } - after_create :remove_blocking_cache + after_create :remove_blocking_cache after_destroy :remove_blocking_cache + private + def remove_blocking_cache - Rails.cache.delete("blocked_account_ids:#{account_id}") + Rails.cache.delete("exclude_account_ids_for:#{account_id}") end end diff --git a/app/models/status.rb b/app/models/status.rb index c05a3386f..a9b7327c3 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -183,9 +183,7 @@ class Status < ApplicationRecord private def filter_timeline(query, account) - 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 + 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) } 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 |