UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ApiV1Controller, add validation messages to update_credentials endpoint

Browse source
This commit is contained in:
Daniel Supernault 2022-02-05 18:39:17 -07:00
parent 74905ba1d0
commit cd78560184
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -74,6 +74,7 @@ use App\Services\{
UserFilterService UserFilterService
}; };
use App\Util\Lexer\Autolink; use App\Util\Lexer\Autolink;
use App\Util\Lexer\PrettyNumber;
use App\Util\Localization\Localization; use App\Util\Localization\Localization;
use App\Util\Media\License; use App\Util\Media\License;
use App\Jobs\MediaPipeline\MediaSyncLicensePipeline; use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
@ -182,13 +183,17 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'avatar' => 'sometimes|mimetypes:image/jpeg,image/png', 'avatar' => 'sometimes|mimetypes:image/jpeg,image/png|min:10|max:' . config('pixelfed.max_avatar_size'),
'display_name' => 'nullable|string', 'display_name' => 'nullable|string',
'note' => 'nullable|string', 'note' => 'nullable|string',
'locked' => 'nullable', 'locked' => 'nullable',
'website' => 'nullable', 'website' => 'nullable',
// 'source.privacy' => 'nullable|in:unlisted,public,private', // 'source.privacy' => 'nullable|in:unlisted,public,private',
// 'source.sensitive' => 'nullable|boolean' // 'source.sensitive' => 'nullable|boolean'
], [
'required' => 'The :attribute field is required.',
'avatar.mimetypes' => 'The file must be in jpeg or png format',
'avatar.max' => 'The :attribute exceeds the file size limit of ' . PrettyNumber::size(config('pixelfed.max_avatar_size'), true, false),
]); ]);
$user = $request->user(); $user = $request->user();
@ -201,8 +206,6 @@ class ApiV1Controller extends Controller
$licenseChanged = false; $licenseChanged = false;
$composeSettings = array_merge(AccountService::defaultSettings()['compose_settings'], $settings->compose_settings ?? []); $composeSettings = array_merge(AccountService::defaultSettings()['compose_settings'], $settings->compose_settings ?? []);
// return $request->input('locked');
if($request->has('avatar')) { if($request->has('avatar')) {
$av = Avatar::whereProfileId($profile->id)->first(); $av = Avatar::whereProfileId($profile->id)->first();
if($av) { if($av) {