Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)
This commit is contained in:
parent
bb911043de
commit
8518d005fd
2 changed files with 22 additions and 4 deletions
|
@ -9,7 +9,7 @@ class StatusFilter
|
|||
end
|
||||
|
||||
def filtered?
|
||||
account_present? && filtered_status?
|
||||
blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -19,7 +19,7 @@ class StatusFilter
|
|||
end
|
||||
|
||||
def filtered_status?
|
||||
blocking_account? || blocking_domain? || muting_account? || silenced_account? || blocked_by_policy?
|
||||
blocking_account? || blocking_domain? || muting_account?
|
||||
end
|
||||
|
||||
def blocking_account?
|
||||
|
@ -43,7 +43,7 @@ class StatusFilter
|
|||
end
|
||||
|
||||
def account_following_status_account?
|
||||
account.following? status.account_id
|
||||
account&.following? status.account_id
|
||||
end
|
||||
|
||||
def blocked_by_policy?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue