diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:20:29 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:20:29 +0200 |
commit | 0e0347ea3c518e3e002a23ba84dc2f8ec4505984 (patch) | |
tree | a6ff64dec8a236a5d4807452f511379cf5d2d188 /app/models/status.rb | |
parent | f03fb6c0aed5bdbe60a9f34c5de93865bf3e58eb (diff) | |
parent | f5cd0b4956445d3e30d555a55d58fe8a04560632 (diff) |
Merge branch 'pixiv-fix/cache_blocking'
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index e54664275..a9b7327c3 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -183,7 +183,7 @@ 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("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 |