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

Add reject public unlisted subscription configs

Browse source
This commit is contained in:
KMY 2023-04-30 21:36:49 +09:00
parent ae4da45054
commit 7d3d93e9a4
21 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/lib/status_reach_finder.rb
View file

@ -105,9 +105,10 @@ 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_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(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.setting_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

10
app/lib/user_settings_decorator.rb
View file

@ -21,6 +21,8 @@ class UserSettingsDecorator
user.settings['default_searchability']=default_searchability_preference if change?('setting_default_searchability')
user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive')
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['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')
@ -68,6 +70,14 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_public_post_to_unlisted'
end
def reject_public_unlisted_subscription_preference
boolean_cast_setting 'setting_reject_public_unlisted_subscription_preference'
end
def reject_unlisted_subscription_preference
boolean_cast_setting 'setting_reject_unlisted_subscription_preference'
end
def unfollow_modal_preference
boolean_cast_setting 'setting_unfollow_modal'
end