From 396f6f0140b0f76162e2378fd5a61e2f888673ed Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 17 Aug 2022 14:27:04 +0200 Subject: Cleanup useless express validator messages --- server/middlewares/validators/user-subscriptions.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'server/middlewares/validators/user-subscriptions.ts') diff --git a/server/middlewares/validators/user-subscriptions.ts b/server/middlewares/validators/user-subscriptions.ts index 73da3142a..d9e6aa667 100644 --- a/server/middlewares/validators/user-subscriptions.ts +++ b/server/middlewares/validators/user-subscriptions.ts @@ -9,7 +9,9 @@ import { ActorFollowModel } from '../../models/actor/actor-follow' import { areValidationErrors } from './shared' const userSubscriptionListValidator = [ - 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 userSubscriptionListValidator parameters', { parameters: req.query }) @@ -21,7 +23,8 @@ const userSubscriptionListValidator = [ ] const userSubscriptionAddValidator = [ - body('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'), + body('uri') + .custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking userSubscriptionAddValidator parameters', { parameters: req.body }) @@ -35,7 +38,7 @@ const userSubscriptionAddValidator = [ const areSubscriptionsExistValidator = [ query('uris') .customSanitizer(toArray) - .custom(areValidActorHandles).withMessage('Should have a valid uri array'), + .custom(areValidActorHandles).withMessage('Should have a valid array of URIs'), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking areSubscriptionsExistValidator parameters', { parameters: req.query }) @@ -47,7 +50,8 @@ const areSubscriptionsExistValidator = [ ] const userSubscriptionGetValidator = [ - param('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to unfollow'), + param('uri') + .custom(isValidActorHandle), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking userSubscriptionGetValidator parameters', { parameters: req.params }) -- cgit v1.2.3