gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-05 18:55:45 +09:00
commit 86915f0cdb
9 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/lib/status_filter.rb
View file

@ -15,6 +15,12 @@ class StatusFilter
blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
end
def search_filtered?
return false if !account.nil? && account.id == status.account_id
blocked_by_policy_search? || (account_present? && filtered_status?) || silenced_account?
end
private
def account_present?
@ -53,7 +59,15 @@ class StatusFilter
!policy_allows_show?
end
def blocked_by_policy_search?
!policy_allows_search?
end
def policy_allows_show?
StatusPolicy.new(account, status, @preloaded_relations).show?
end
def policy_allows_search?
StatusPolicy.new(account, status, @preloaded_relations).search?
end
end