Merge pull request #4251 from pixelfed/staging

Staging

CHANGELOG.md

@@ -141,6 +141,8 @@
 - Update admin instance management, improve filtering/sorting and add import/export support ([d5d9500d](https://github.com/pixelfed/pixelfed/commit/d5d9500d))
 - Update Post component, show state error when status account is null or missing ([e6dc6234](https://github.com/pixelfed/pixelfed/commit/e6dc6234))
 - Update private profile view, add rel=me support, hide avatar/bio when not logged in and add robots meta tag to block search engine indexing on private profiles ([ab4bb9a0](https://github.com/pixelfed/pixelfed/commit/ab4bb9a0))
+- Update settings, set maxlength on name and bio inputs. Fixes #4248 ([558700fc](https://github.com/pixelfed/pixelfed/commit/558700fc))
+- Update api routes, add post method support to /api/v1/accounts/update_credentials to properly handle binary form data (avatars). Fixes #4250 ([1ae19ea5](https://github.com/pixelfed/pixelfed/commit/1ae19ea5))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Http/Controllers/Settings/HomeSettings.php

@@ -22,7 +22,6 @@ use App\Services\PronounService;
 
 trait HomeSettings
 {
-
 	public function home()
 	{
 		$id = Auth::user()->profile->id;
@@ -41,7 +40,7 @@ trait HomeSettings
 	public function homeUpdate(Request $request)
 	{
 		$this->validate($request, [
-			'name'    => 'required|string|max:'.config('pixelfed.max_name_length'),
+			'name'    => 'nullable|string|max:'.config('pixelfed.max_name_length'),
 			'bio'     => 'nullable|string|max:'.config('pixelfed.max_bio_length'),
 			'website' => 'nullable|url',
 			'language' => 'nullable|string|min:2|max:5',

resources/views/settings/home.blade.php

@@ -39,7 +39,7 @@
 		<div class="form-group row">
 			<label for="name" class="col-sm-3 col-form-label font-weight-bold">Name</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="name" name="name" placeholder="Your Name" value="{{Auth::user()->profile->name}}" v-pre>
+				<input type="text" class="form-control" id="name" name="name" placeholder="Your Name" maxlength="30" value="{{Auth::user()->profile->name}}" v-pre>
 			</div>
 		</div>
 		<div class="form-group row">
@@ -51,7 +51,15 @@
 		<div class="form-group row">
 			<label for="bio" class="col-sm-3 col-form-label font-weight-bold">Bio</label>
 			<div class="col-sm-9">
-				<textarea class="form-control" id="bio" name="bio" placeholder="Add a bio here" rows="2" data-max-length="{{config('pixelfed.max_bio_length')}}" v-pre>{{strip_tags(Auth::user()->profile->bio)}}</textarea>
+				<textarea
+					class="form-control"
+					id="bio"
+					name="bio"
+					placeholder="Add a bio here"
+					rows="2"
+					data-max-length="{{config('pixelfed.max_bio_length')}}"
+					maxlength="{{config('pixelfed.max_bio_length')}}"
+					v-pre>{{strip_tags(Auth::user()->profile->bio)}}</textarea>
 				<p class="form-text">
 					<span class="bio-counter float-right small text-muted">0/{{config('pixelfed.max_bio_length')}}</span>
 				</p>

routes/api.php

@@ -26,7 +26,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
 		Route::get('bookmarks', 'Api\ApiV1Controller@bookmarks')->middleware($middleware);
 
 		Route::get('accounts/verify_credentials', 'Api\ApiV1Controller@verifyCredentials')->middleware($middleware);
-		Route::patch('accounts/update_credentials', 'Api\ApiV1Controller@accountUpdateCredentials')->middleware($middleware);
+		Route::match(['post', 'patch'], 'accounts/update_credentials', 'Api\ApiV1Controller@accountUpdateCredentials')->middleware($middleware);
 		Route::get('accounts/relationships', 'Api\ApiV1Controller@accountRelationshipsById')->middleware($middleware);
 		Route::get('accounts/search', 'Api\ApiV1Controller@accountSearch')->middleware($middleware);
 		Route::get('accounts/{id}/statuses', 'Api\ApiV1Controller@accountStatusesById')->middleware($middleware);