tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to require invite request text (#15326)

Browse Source 
Fixes #15273

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
ThibG
2020-12-14 10:03:09 +01:00
committed by GitHub
parent a7e819b8a8
commit 47e507fa61
9 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/form/admin_settings.rb
View File

@ -35,6 +35,7 @@ class Form::AdminSettings
show_domain_blocks
show_domain_blocks_rationale
noindex
require_invite_text
).freeze
BOOLEAN_KEYS = %i(
@ -51,6 +52,7 @@ class Form::AdminSettings
trends
trendable_by_default
noindex
require_invite_text
).freeze
UPLOAD_KEYS = %i(

3
app/models/user.rb
View File

@ -82,7 +82,8 @@ class User < ApplicationRecord
has_many :webauthn_credentials, dependent: :destroy
has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? }
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
validates :invite_request, presence: true, on: :create, if: -> { Setting.require_invite_text }
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
validates_with BlacklistedEmailValidator, on: :create