1
0
Fork 0
forked from gitea/nas

Remove: メディアを配送しない設定の削除 (#445)

This commit is contained in:
KMY(雪あすか) 2024-01-11 09:16:59 +09:00 committed by GitHub
parent 92a16218c9
commit 407a53aa33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 7 additions and 23 deletions

View file

@ -45,7 +45,7 @@ class AccountStatusesFilter
def initial_scope
return Status.none if account.unavailable?
if domain_block&.reject_send_media || blocked?
if blocked?
Status.none
elsif anonymous?
account.statuses.where(visibility: %i(public unlisted public_unlisted))

View file

@ -195,7 +195,6 @@ class StatusReachFinder
[]
else
blocks = DomainBlock.where(domain: nil)
blocks = blocks.or(DomainBlock.where(reject_send_media: true)) if status.with_media?
blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if (status.with_media? && status.sensitive) || status.spoiler_text?
blocks.pluck(:domain).uniq
end