**MAJOR**: fix access policy short-circuit bug caused by `fa8437f49` & `cb38a5899` - **if you are running a monsterfork revision between `fa8437f49` and `389125d89` upgrade or apply this patch immediately!

master
multiple creatures 2020-02-01 10:52:51 -06:00
parent 389125d894
commit 0a5e08ebe7
1 changed files with 5 additions and 3 deletions

View File

@ -13,13 +13,15 @@ class StatusFilter
end
def filtered?
return true if status.nil?
return false if !account.nil? && account.id == status.account_id || account.nil?
return true if status.nil? || blocked_by_policy?
return false if account.nil? || account.id == status.account_id
return true if redis.sismember("filtered_statuses:#{account.id}", status.id)
if blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
if filtered_status? || silenced_account?
redis.sadd("filtered_statuses:#{account.id}", status.id)
return true
end
false
end