more fixes

app/Http/Requests/AvatarUploadRequest.php

@@ -22,6 +22,7 @@ class AvatarUploadRequest extends FormRequest
                 'mimes:jpg,jpeg,png,webp',
                 'mimetypes:image/jpeg,image/png,image/webp',
             ],
+            'avatar_position' => ['nullable', 'in:top-left,top,top-right,left,center,right,bottom-left,bottom,bottom-right'],
         ];
     }
 }

app/Http/Requests/Settings/RequestEmailChangeRequest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use App\Models\User;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class RequestEmailChangeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('new_email')) {
+            $this->merge([
+                'new_email' => strtolower(trim((string) $this->input('new_email'))),
+            ]);
+        }
+    }
+
+    public function rules(): array
+    {
+        return [
+            'new_email' => [
+                'required',
+                'string',
+                'lowercase',
+                'email',
+                'max:255',
+                Rule::unique(User::class, 'email')->ignore((int) $this->user()->id),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if (strtolower((string) $value) === strtolower((string) $this->user()->email)) {
+                        $fail('Please enter a different email address.');
+                    }
+                },
+            ],
+        ];
+    }
+}

app/Http/Requests/Settings/UpdateAccountSectionRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use App\Http\Requests\UsernameRequest;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateAccountSectionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('username')) {
+            $this->merge([
+                'username' => \App\Support\UsernamePolicy::normalize((string) $this->input('username')),
+            ]);
+        }
+    }
+
+    public function rules(): array
+    {
+        return [
+            'username' => ['required', ...UsernameRequest::rulesFor((int) $this->user()->id)],
+        ];
+    }
+}

app/Http/Requests/Settings/UpdateNotificationsSectionRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateNotificationsSectionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'email_notifications' => ['required', 'boolean'],
+            'upload_notifications' => ['required', 'boolean'],
+            'follower_notifications' => ['required', 'boolean'],
+            'comment_notifications' => ['required', 'boolean'],
+            'newsletter' => ['required', 'boolean'],
+        ];
+    }
+}

app/Http/Requests/Settings/UpdatePersonalSectionRequest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePersonalSectionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'birthday' => ['nullable', 'date', 'before:today'],
+            'gender' => ['nullable', 'in:m,f,x,M,F,X'],
+            'country' => ['nullable', 'string', 'max:10'],
+        ];
+    }
+}

app/Http/Requests/Settings/UpdateProfileSectionRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateProfileSectionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'display_name' => ['required', 'string', 'max:60'],
+            'website' => ['nullable', 'url', 'max:255'],
+            'bio' => ['nullable', 'string', 'max:200'],
+            'signature' => ['nullable', 'string', 'max:1000'],
+            'description' => ['nullable', 'string', 'max:1000'],
+            'avatar' => ['nullable', 'file', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp', 'mimetypes:image/jpeg,image/png,image/webp'],
+            'remove_avatar' => ['nullable', 'boolean'],
+            'avatar_position' => ['nullable', 'in:top-left,top,top-right,left,center,right,bottom-left,bottom,bottom-right'],
+        ];
+    }
+}

app/Http/Requests/Settings/UpdateSecurityPasswordRequest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rules\Password;
+
+class UpdateSecurityPasswordRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'current_password' => ['required', 'current_password'],
+            'new_password' => ['required', 'confirmed', Password::min(8)],
+        ];
+    }
+}

app/Http/Requests/Settings/VerifyEmailChangeRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\Settings;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class VerifyEmailChangeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('code')) {
+            $this->merge([
+                'code' => preg_replace('/\D+/', '', (string) $this->input('code')),
+            ]);
+        }
+    }
+
+    public function rules(): array
+    {
+        return [
+            'code' => ['required', 'digits:6'],
+        ];
+    }
+}