🆙 More fixes 🆙

This commit is contained in:
Remco
2026-01-19 21:38:46 +01:00
parent a3586425ce
commit 9dfe95ff52
@@ -10,11 +10,16 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
class AccountSettingsFormRequest extends FormRequest class AccountSettingsFormRequest extends FormRequest
{ {
/**
* @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\InvokableRule|\Illuminate\Contracts\Validation\Rule>>
*/
public function rules(): array public function rules(): array
{ {
$userId = $this->user()?->id;
return [ return [
'username' => ['sometimes', 'string', sprintf('regex:%s', setting('username_regex')), 'min:3', 'max:25', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule], 'username' => ['sometimes', 'string', sprintf('regex:%s', setting('username_regex')), 'min:3', 'max:25', Rule::unique('users')->ignore($userId), new WebsiteWordfilterRule],
'mail' => ['required', 'email', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule], 'mail' => ['required', 'email', Rule::unique('users')->ignore($userId), new WebsiteWordfilterRule],
'motto' => ['nullable', 'string', 'max:127', new WebsiteWordfilterRule], 'motto' => ['nullable', 'string', 'max:127', new WebsiteWordfilterRule],
'g-recaptcha-response' => [new GoogleRecaptchaRule], 'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [app(Turnstile::class)], 'cf-turnstile-response' => [app(Turnstile::class)],