Add user config rejecting admin domain block settings
This commit is contained in:
parent
a4332babb5
commit
3a1c73f607
8 changed files with 37 additions and 14 deletions
|
@ -111,13 +111,17 @@ class StatusPolicy < ApplicationPolicy
|
|||
def server_blocking_domain_of_status?(status)
|
||||
@domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
|
||||
if @domain_block
|
||||
(@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
|
||||
(@domain_block.reject_send_public_unlisted && status.public_unlisted_visibility?) ||
|
||||
(@domain_block.reject_send_dissubscribable && status.account.dissubscribable) ||
|
||||
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription) ||
|
||||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.reject_unlisted_subscription) ||
|
||||
(@domain_block.reject_send_media && status.with_media?) ||
|
||||
(@domain_block.reject_send_sensitive && ((status.with_media? && status.sensitive) || status.spoiler_text?))
|
||||
unless status.account.user&.send_without_domain_blocks?
|
||||
(@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
|
||||
(@domain_block.reject_send_public_unlisted && status.public_unlisted_visibility?) ||
|
||||
(@domain_block.reject_send_dissubscribable && status.account.dissubscribable) ||
|
||||
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription) ||
|
||||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.reject_unlisted_subscription) ||
|
||||
(@domain_block.reject_send_media && status.with_media?) ||
|
||||
(@domain_block.reject_send_sensitive && ((status.with_media? && status.sensitive) || status.spoiler_text?))
|
||||
else
|
||||
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription) ||
|
||||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.reject_unlisted_subscription)
|
||||
else
|
||||
false
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue