Add considering reblogged status domain block
This commit is contained in:
parent
3ffc470a03
commit
ae4da45054
2 changed files with 29 additions and 14 deletions
|
@ -96,13 +96,20 @@ class StatusReachFinder
|
|||
|
||||
def banned_domains
|
||||
return @banned_domains if @banned_domains
|
||||
|
||||
domains = banned_domains_of_status(@status)
|
||||
domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog?
|
||||
return @banned_domains = domains
|
||||
end
|
||||
|
||||
def banned_domains_of_status(status)
|
||||
blocks = DomainBlock.where(domain: nil)
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if @status.compute_searchability != 'public'
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_unlisted_dissubscribable: true)) if @status.unlisted_visibility? && @status.account.dissubscribable
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_public_unlisted: true)) if @status.public_unlisted_visibility?
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_dissubscribable: true)) if @status.account.dissubscribable
|
||||
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
|
||||
return @banned_domains = blocks.pluck(:domain).uniq
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if status.compute_searchability != 'public'
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_unlisted_dissubscribable: true)) if status.unlisted_visibility? && status.account.dissubscribable
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_public_unlisted: true)) if status.public_unlisted_visibility?
|
||||
blocks = blocks.or(DomainBlock.where(reject_send_dissubscribable: true)) if status.account.dissubscribable
|
||||
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
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue