diff options
| -rw-r--r-- | app/models/block.rb | 8 | ||||
| -rw-r--r-- | app/models/mute.rb | 7 | ||||
| -rw-r--r-- | app/models/status.rb | 4 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/models/block.rb b/app/models/block.rb index ae456a6b6..ac1e1b0b1 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -7,4 +7,12 @@ class Block < ApplicationRecord belongs_to :target_account, class_name: 'Account', required: true 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 diff --git a/app/models/mute.rb b/app/models/mute.rb index a5b334c85..875d030e9 100644 --- a/app/models/mute.rb +++ b/app/models/mute.rb @@ -8,4 +8,11 @@ class Mute < ApplicationRecord validates :account, :target_account, presence: true 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 diff --git a/app/models/status.rb b/app/models/status.rb index 16cd4383f..22d93947a 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -180,7 +180,9 @@ class Status < ApplicationRecord private 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('accounts.silenced = TRUE') if account.silenced? # and if we're hellbanned, only people who are also hellbanned query |