Remove: メディアを配送しない設定の削除 (#445)
This commit is contained in:
parent
92a16218c9
commit
407a53aa33
12 changed files with 7 additions and 23 deletions
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue