**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!
parent
389125d894
commit
0a5e08ebe7
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue