X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fvideos%2Fvideo-channels.ts;h=ad1415691f35af46107eb7153ada4e5dba3ab1c6;hb=396f6f0140b0f76162e2378fd5a61e2f888673ed;hp=d53c777fac8ac7a20f59f602de31c943d57025c8;hpb=97eba003a9d0adcb0cab9190f566327b1417c7d3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/videos/video-channels.ts b/server/middlewares/validators/videos/video-channels.ts index d53c777fa..ad1415691 100644 --- a/server/middlewares/validators/videos/video-channels.ts +++ b/server/middlewares/validators/videos/video-channels.ts @@ -19,10 +19,16 @@ import { areValidationErrors, checkUserQuota, doesVideoChannelNameWithHostExist import { doesVideoChannelSyncIdExist } from '../shared/video-channel-syncs' export const videoChannelsAddValidator = [ - body('name').custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), - body('displayName').custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), - body('description').optional().custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), - body('support').optional().custom(isVideoChannelSupportValid).withMessage('Should have a valid support text'), + body('name') + .custom(isVideoChannelUsernameValid), + body('displayName') + .custom(isVideoChannelDisplayNameValid), + body('description') + .optional() + .custom(isVideoChannelDescriptionValid), + body('support') + .optional() + .custom(isVideoChannelSupportValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoChannelsAdd parameters', { parameters: req.body }) @@ -49,16 +55,18 @@ export const videoChannelsAddValidator = [ ] export const videoChannelsUpdateValidator = [ - param('nameWithHost').exists().withMessage('Should have an video channel name with host'), + param('nameWithHost') + .exists(), + body('displayName') .optional() - .custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), + .custom(isVideoChannelDisplayNameValid), body('description') .optional() - .custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), + .custom(isVideoChannelDescriptionValid), body('support') .optional() - .custom(isVideoChannelSupportValid).withMessage('Should have a valid support text'), + .custom(isVideoChannelSupportValid), body('bulkVideosSupportUpdate') .optional() .custom(isBooleanValid).withMessage('Should have a valid bulkVideosSupportUpdate boolean field'), @@ -83,7 +91,8 @@ export const videoChannelsRemoveValidator = [ ] export const videoChannelsNameWithHostValidator = [ - param('nameWithHost').exists().withMessage('Should have an video channel name with host'), + param('nameWithHost') + .exists(), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoChannelsNameWithHostValidator parameters', { parameters: req.params }) @@ -124,7 +133,7 @@ export const videoChannelStatsValidator = [ query('withStats') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid stats flag'), + .custom(isBooleanValid).withMessage('Should have a valid stats flag boolean'), (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return @@ -133,7 +142,9 @@ export const videoChannelStatsValidator = [ ] export const videoChannelsListValidator = [ - query('search').optional().not().isEmpty().withMessage('Should have a valid search'), + query('search') + .optional() + .not().isEmpty(), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking video channels search query', { parameters: req.query }) @@ -145,11 +156,12 @@ export const videoChannelsListValidator = [ ] export const videoChannelImportVideosValidator = [ - body('externalChannelUrl').custom(isUrlValid).withMessage('Should have a valid channel url'), + body('externalChannelUrl') + .custom(isUrlValid), body('videoChannelSyncId') .optional() - .custom(isIdValid).withMessage('Should have a valid channel sync id'), + .custom(isIdValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoChannelImport parameters', { parameters: req.body })