forks/peertube
1
0
Fork 0
Code Releases Activity

Trim video name also on server

Browse source
This commit is contained in:
Chocobozzz 2021-02-25 10:01:33 +01:00
parent 56b0a516f2
commit 0221f8c9b1
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/src/app/shared/form-validators/video-validators.ts
View file

@ -3,15 +3,14 @@ import { BuildFormValidator } from './form-validator.model'
export const trimValidator: ValidatorFn = (control: FormControl) => { export const trimValidator: ValidatorFn = (control: FormControl) => {
if (control.value.startsWith(' ') || control.value.endsWith(' ')) { if (control.value.startsWith(' ') || control.value.endsWith(' ')) {
return { return { spaces: true }
'spaces': true
}
} }
return null;
}; return null
}
export const VIDEO_NAME_VALIDATOR: BuildFormValidator = { export const VIDEO_NAME_VALIDATOR: BuildFormValidator = {
VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120), trimValidator ], VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ],
MESSAGES: { MESSAGES: {
'required': $localize`Video name is required.`, 'required': $localize`Video name is required.`,
'minlength': $localize`Video name must be at least 3 characters long.`, 'minlength': $localize`Video name must be at least 3 characters long.`,

2
server/middlewares/validators/videos/videos.ts
View file

@ -62,6 +62,7 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([
.custom((value, { req }) => isFileFieldValid(req.files, 'videofile')) .custom((value, { req }) => isFileFieldValid(req.files, 'videofile'))
.withMessage('Should have a file'), .withMessage('Should have a file'),
body('name') body('name')
.trim()
.custom(isVideoNameValid) .custom(isVideoNameValid)
.withMessage('Should have a valid name'), .withMessage('Should have a valid name'),
body('channelId') body('channelId')
@ -129,6 +130,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([
param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
body('name') body('name')
.optional() .optional()
.trim()
.custom(isVideoNameValid).withMessage('Should have a valid name'), .custom(isVideoNameValid).withMessage('Should have a valid name'),
body('channelId') body('channelId')
.optional() .optional()