fix(settings): allow users to wipe their motto values

RetroAchievements · Sep 6, 2024 · 95bad98 · 95bad98
1 parent a8043da
commit 95bad98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/Community/Data/UpdateProfileData.php b/app/Community/Data/UpdateProfileData.php
@@ -22,8 +22,8 @@ public static function fromRequest(UpdateProfileRequest $request): self
         $user = $request->user();
 
         return new self(
-            motto: $request->motto ?? $user->Motto,
-            userWallActive: $request->userWallActive ?? $user->UserWallActive,
+            motto: $request->motto,
+            userWallActive: $request->userWallActive,
         );
     }
 

diff --git a/app/Community/Requests/UpdateProfileRequest.php b/app/Community/Requests/UpdateProfileRequest.php
@@ -33,4 +33,11 @@ public function rules(): array
             'userWallActive' => 'nullable|boolean',
         ];
     }
+
+    protected function prepareForValidation(): void
+    {
+        $this->merge([
+            'motto' => $this->input('motto') ?? '', // Don't cast empty strings to null.
+        ]);
+    }
 }