Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking

Browse source
This commit is contained in:
Eugen Rochko 2017-04-18 01:09:57 +02:00
commit 2fd0473aa1
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/status.rb
View file

@ -183,7 +183,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