diff options
Diffstat (limited to 'server/middlewares/validators/videos/video-channels.ts')
-rw-r--r-- | server/middlewares/validators/videos/video-channels.ts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/middlewares/validators/videos/video-channels.ts b/server/middlewares/validators/videos/video-channels.ts index e7df185e4..3b5693d23 100644 --- a/server/middlewares/validators/videos/video-channels.ts +++ b/server/middlewares/validators/videos/video-channels.ts | |||
@@ -3,13 +3,13 @@ import { body, param, query } from 'express-validator' | |||
3 | import { VIDEO_CHANNELS } from '@server/initializers/constants' | 3 | import { VIDEO_CHANNELS } from '@server/initializers/constants' |
4 | import { MChannelAccountDefault, MUser } from '@server/types/models' | 4 | import { MChannelAccountDefault, MUser } from '@server/types/models' |
5 | import { UserRight } from '../../../../shared' | 5 | import { UserRight } from '../../../../shared' |
6 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | 6 | import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' |
7 | import { isActorPreferredUsernameValid } from '../../../helpers/custom-validators/activitypub/actor' | ||
8 | import { isBooleanValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc' | 7 | import { isBooleanValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc' |
9 | import { | 8 | import { |
10 | isVideoChannelDescriptionValid, | 9 | isVideoChannelDescriptionValid, |
11 | isVideoChannelNameValid, | 10 | isVideoChannelDisplayNameValid, |
12 | isVideoChannelSupportValid | 11 | isVideoChannelSupportValid, |
12 | isVideoChannelUsernameValid | ||
13 | } from '../../../helpers/custom-validators/video-channels' | 13 | } from '../../../helpers/custom-validators/video-channels' |
14 | import { logger } from '../../../helpers/logger' | 14 | import { logger } from '../../../helpers/logger' |
15 | import { ActorModel } from '../../../models/actor/actor' | 15 | import { ActorModel } from '../../../models/actor/actor' |
@@ -17,8 +17,8 @@ import { VideoChannelModel } from '../../../models/video/video-channel' | |||
17 | import { areValidationErrors, doesLocalVideoChannelNameExist, doesVideoChannelNameWithHostExist } from '../shared' | 17 | import { areValidationErrors, doesLocalVideoChannelNameExist, doesVideoChannelNameWithHostExist } from '../shared' |
18 | 18 | ||
19 | const videoChannelsAddValidator = [ | 19 | const videoChannelsAddValidator = [ |
20 | body('name').custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'), | 20 | body('name').custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), |
21 | body('displayName').custom(isVideoChannelNameValid).withMessage('Should have a valid display name'), | 21 | body('displayName').custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), |
22 | body('description').optional().custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), | 22 | body('description').optional().custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), |
23 | body('support').optional().custom(isVideoChannelSupportValid).withMessage('Should have a valid support text'), | 23 | body('support').optional().custom(isVideoChannelSupportValid).withMessage('Should have a valid support text'), |
24 | 24 | ||
@@ -50,7 +50,7 @@ const videoChannelsUpdateValidator = [ | |||
50 | param('nameWithHost').exists().withMessage('Should have an video channel name with host'), | 50 | param('nameWithHost').exists().withMessage('Should have an video channel name with host'), |
51 | body('displayName') | 51 | body('displayName') |
52 | .optional() | 52 | .optional() |
53 | .custom(isVideoChannelNameValid).withMessage('Should have a valid display name'), | 53 | .custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), |
54 | body('description') | 54 | body('description') |
55 | .optional() | 55 | .optional() |
56 | .custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), | 56 | .custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'), |
@@ -117,7 +117,7 @@ const videoChannelsNameWithHostValidator = [ | |||
117 | ] | 117 | ] |
118 | 118 | ||
119 | const localVideoChannelValidator = [ | 119 | const localVideoChannelValidator = [ |
120 | param('name').custom(isVideoChannelNameValid).withMessage('Should have a valid video channel name'), | 120 | param('name').custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid video channel name'), |
121 | 121 | ||
122 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | 122 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { |
123 | logger.debug('Checking localVideoChannelValidator parameters', { parameters: req.params }) | 123 | logger.debug('Checking localVideoChannelValidator parameters', { parameters: req.params }) |