diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 24b3f22..c6321e4 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -151,7 +151,7 @@ public static function getValidations() 'nullable', // Discord user name validation: https://discord.com/developers/docs/resources/user // (simplified because we don't need to check all edge cases) - 'regex:/^[^@#:]{2,32}#[0-9]{4}$/', + 'regex:/^[^@#:]{2,32}(#[0-9]{4})?$/', ], "tweet" => [ 'max:280', diff --git a/lang/en/validation.php b/lang/en/validation.php index ce38a7c..564f420 100644 --- a/lang/en/validation.php +++ b/lang/en/validation.php @@ -33,7 +33,7 @@ 'regex' => 'Please verify your Telegram handle, it must be between 5 and 32 characters and only contain letters, numbers and underscores (_).' ], 'discord' => [ - 'regex' => 'Please verify your Discord handle, it must consist of your username (between 2 and 32 characters) followed by a # and four digits (e.g. "mynick#1234").' + 'regex' => 'Please verify your Discord handle, it must be between 2 and 32 characters and may optionally have the old format appended to it (e.g. mynick#1234).' ], 'attends_sat' => [ 'required_without_all' => 'Please select at least one day when you will be in the Dealers\' Den.' diff --git a/resources/views/forms/profile.blade.php b/resources/views/forms/profile.blade.php index 0e7c7dd..a0f873a 100644 --- a/resources/views/forms/profile.blade.php +++ b/resources/views/forms/profile.blade.php @@ -171,7 +171,7 @@ class="form-control @error('short_desc') is-invalid @enderror" id="short_desc">{
{{ $message }}
@enderror
- A short description, 1 - 3 sentences, to appear in the dealer list next to your thumbnail image. + A short description, 1 - 3 sentences, to appear in your profile header.
@@ -356,7 +356,7 @@ class="form-control @error('telegram') is-invalid @enderror" id="telegram"
- @error('discord')