post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add user config rejecting admin domain block settings

Browse source
This commit is contained in:
KMY 2023-05-01 12:33:26 +09:00
parent a4332babb5
commit 3a1c73f607
8 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/lib/status_reach_finder.rb
View file

@ -126,13 +126,15 @@ class StatusReachFinder
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_public_unlisted: true)) if status.public_unlisted_visibility?
blocks = blocks.or(DomainBlock.where(reject_send_dissubscribable: true)) if status.account.dissubscribable
unless status.account.user&.send_without_domain_blocks?
blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if status.compute_searchability != 'public'
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?
end
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription?
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.reject_unlisted_subscription?
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

9
app/lib/user_settings_decorator.rb
View file

@ -23,6 +23,7 @@ class UserSettingsDecorator
user.settings['public_post_to_unlisted']=public_post_to_unlisted_preference if change?('setting_public_post_to_unlisted')
user.settings['reject_public_unlisted_subscription'] = reject_public_unlisted_subscription_preference if change?('setting_reject_public_unlisted_subscription')
user.settings['reject_unlisted_subscription'] = reject_unlisted_subscription_preference if change?('setting_reject_unlisted_subscription')
user.settings['send_without_domain_blocks']=send_without_domain_blocks_preference if change?('setting_send_without_domain_blocks')
user.settings['default_language'] = default_language_preference if change?('setting_default_language')
user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal')
user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal')
@ -71,11 +72,15 @@ class UserSettingsDecorator
end
def reject_public_unlisted_subscription_preference
boolean_cast_setting 'setting_reject_public_unlisted_subscription_preference'
boolean_cast_setting 'setting_reject_public_unlisted_subscription'
end
def reject_unlisted_subscription_preference
boolean_cast_setting 'setting_reject_unlisted_subscription_preference'
boolean_cast_setting 'setting_reject_unlisted_subscription'
end
def send_without_domain_blocks_preference
boolean_cast_setting 'setting_send_without_domain_blocks'
end
def unfollow_modal_preference