Addo domein block extra supports
This commit is contained in:
parent
bb7fa1d060
commit
9ad92e6a09
24 changed files with 331 additions and 35 deletions
|
@ -22,7 +22,7 @@ class StatusReachFinder
|
|||
if @status.reblog?
|
||||
[]
|
||||
else
|
||||
Account.where(id: reached_account_ids).inboxes
|
||||
Account.where(id: reached_account_ids).where.not(domain: banned_domains).inboxes
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -74,7 +74,7 @@ class StatusReachFinder
|
|||
elsif @status.direct_visibility? || @status.limited_visibility?
|
||||
[]
|
||||
else
|
||||
@status.account.followers.inboxes
|
||||
@status.account.followers.where.not(domain: banned_domains).inboxes
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -93,4 +93,16 @@ class StatusReachFinder
|
|||
def unsafe?
|
||||
@options[:unsafe]
|
||||
end
|
||||
|
||||
def banned_domains
|
||||
return @banned_domains if @banned_domains
|
||||
blocks = []
|
||||
blocks << DomainBlock.where(reject_send_not_public_searchability: true).pluck(:domain) if @status.compute_searchability != 'public'
|
||||
blocks << DomainBlock.where(reject_send_unlisted_dissubscribable: true).pluck(:domain) if @status.unlisted_visibility? && @status.account.dissubscribable
|
||||
blocks << DomainBlock.where(reject_send_public_unlisted: true).pluck(:domain) if @status.public_unlisted_visibility?
|
||||
blocks << DomainBlock.where(reject_send_dissubscribable: true).pluck(:domain) if @status.account.dissubscribable
|
||||
blocks << DomainBlock.where(reject_send_media: true).pluck(:domain) if @status.with_media?
|
||||
blocks << DomainBlock.where(reject_send_sensitive: true).pluck(:domain) if (@status.with_media? && @status.sensitive) || @status.spoiler_text
|
||||
return @banned_domains = blocks.uniq
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue