diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/domain_block.rb | 1 | ||||
| -rw-r--r-- | app/models/form/admin_settings.rb | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 26cec6ae6..1d0b25772 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -29,6 +29,7 @@ class DomainBlock < ApplicationRecord scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) } scope :unprocessed, -> { where(processing: true) } + scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)).or(where(reject_unknown: true).or(where(manual_only: true))) } before_save :set_processing diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index c9cd3a87f..08107ee68 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -41,10 +41,8 @@ class Form::AdminSettings always_mark_instance_actors_known werewolf_status spam_check_enabled - mark_known_from_follows - mark_known_from_mentions - mark_known_from_boosts - mark_known_from_favourites + show_domain_blocks + show_domain_blocks_rationale ).freeze BOOLEAN_KEYS = %i( @@ -92,6 +90,8 @@ class Form::AdminSettings validates :site_contact_email, :site_contact_username, presence: true validates :site_contact_username, existing_username: true validates :bootstrap_timeline_accounts, existing_username: { multiple: true } + validates :show_domain_blocks, inclusion: { in: %w(disabled users all) } + validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) } def initialize(_attributes = {}) super |