OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

improve api param message for video names and tags 

closes #4026
pull/4149/head
Rigel Kent 2021-05-31 20:46:22 +02:00
parent 70330f6323
commit 7dab0bd698
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/middlewares/validators/videos/video-imports.ts
View File

@ -33,7 +33,9 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([
), ),
body('name') body('name')
.optional() .optional()
.custom(isVideoNameValid).withMessage('Should have a valid name'), .custom(isVideoNameValid).withMessage(
`Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long`
),
async (req: express.Request, res: express.Response, next: express.NextFunction) => { async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking videoImportAddValidator parameters', { parameters: req.body }) logger.debug('Checking videoImportAddValidator parameters', { parameters: req.body })

5
server/middlewares/validators/videos/video-live.ts
View File

@ -14,6 +14,7 @@ import { VideoModel } from '@server/models/video/video'
import { Hooks } from '@server/lib/plugins/hooks' import { Hooks } from '@server/lib/plugins/hooks'
import { isLocalLiveVideoAccepted } from '@server/lib/moderation' import { isLocalLiveVideoAccepted } from '@server/lib/moderation'
import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
import { CONSTRAINTS_FIELDS } from '@server/initializers/constants'
const videoLiveGetValidator = [ const videoLiveGetValidator = [
param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
@ -43,7 +44,9 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
.custom(isIdValid).withMessage('Should have correct video channel id'), .custom(isIdValid).withMessage('Should have correct video channel id'),
body('name') body('name')
.custom(isVideoNameValid).withMessage('Should have a valid name'), .custom(isVideoNameValid).withMessage(
`Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long`
),
body('saveReplay') body('saveReplay')
.optional() .optional()

20
server/middlewares/validators/videos/videos.ts
View File

@ -65,8 +65,9 @@ const videosAddLegacyValidator = getCommonVideoEditAttributes().concat([
.withMessage('Should have a file'), .withMessage('Should have a file'),
body('name') body('name')
.trim() .trim()
.custom(isVideoNameValid) .custom(isVideoNameValid).withMessage(
.withMessage('Should have a valid name'), `Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long`
),
body('channelId') body('channelId')
.customSanitizer(toIntOrNull) .customSanitizer(toIntOrNull)
.custom(isIdValid).withMessage('Should have correct video channel id'), .custom(isIdValid).withMessage('Should have correct video channel id'),
@ -146,8 +147,9 @@ const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([
.withMessage('Should have a valid filename'), .withMessage('Should have a valid filename'),
body('name') body('name')
.trim() .trim()
.custom(isVideoNameValid) .custom(isVideoNameValid).withMessage(
.withMessage('Should have a valid name'), `Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long`
),
body('channelId') body('channelId')
.customSanitizer(toIntOrNull) .customSanitizer(toIntOrNull)
.custom(isIdValid).withMessage('Should have correct video channel id'), .custom(isIdValid).withMessage('Should have correct video channel id'),
@ -196,7 +198,9 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([
body('name') body('name')
.optional() .optional()
.trim() .trim()
.custom(isVideoNameValid).withMessage('Should have a valid name'), .custom(isVideoNameValid).withMessage(
`Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long`
),
body('channelId') body('channelId')
.optional() .optional()
.customSanitizer(toIntOrNull) .customSanitizer(toIntOrNull)
@ -455,7 +459,11 @@ function getCommonVideoEditAttributes () {
body('tags') body('tags')
.optional() .optional()
.customSanitizer(toValueOrNull) .customSanitizer(toValueOrNull)
.custom(isVideoTagsValid).withMessage('Should have correct tags'), .custom(isVideoTagsValid)
.withMessage(
`Should have an array of up to ${CONSTRAINTS_FIELDS.VIDEOS.TAGS.max} tags between ` +
`${CONSTRAINTS_FIELDS.VIDEOS.TAG.min} and ${CONSTRAINTS_FIELDS.VIDEOS.TAG.max} characters each`
),
body('commentsEnabled') body('commentsEnabled')
.optional() .optional()
.customSanitizer(toBooleanOrNull) .customSanitizer(toBooleanOrNull)