X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fuser-subscriptions.ts;h=0d0c8ccbf15bd6a4ded535af30037a634542d007;hb=2cb03dc1f4e01ba491c36caff30c33fe9c5bad89;hp=5d4cc94c52c3db5e2e3424980e89edbdde00d550;hpb=2c0ccd4b3f5ec5633879e6b42cd5175e4de207cc;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/user-subscriptions.ts b/server/middlewares/validators/user-subscriptions.ts index 5d4cc94c5..0d0c8ccbf 100644 --- a/server/middlewares/validators/user-subscriptions.ts +++ b/server/middlewares/validators/user-subscriptions.ts @@ -6,6 +6,19 @@ import { ActorFollowModel } from '../../models/activitypub/actor-follow' import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor' import { toArray } from '../../helpers/custom-validators/misc' import { WEBSERVER } from '../../initializers/constants' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' + +const userSubscriptionListValidator = [ + query('search').optional().not().isEmpty().withMessage('Should have a valid search'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking userSubscriptionListValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + return next() + } +] const userSubscriptionAddValidator = [ body('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'), @@ -49,7 +62,7 @@ const userSubscriptionGetValidator = [ if (!subscription || !subscription.ActorFollowing.VideoChannel) { return res - .status(404) + .status(HttpStatusCode.NOT_FOUND_404) .json({ error: `Subscription ${req.params.uri} not found.` }) @@ -64,6 +77,7 @@ const userSubscriptionGetValidator = [ export { areSubscriptionsExistValidator, + userSubscriptionListValidator, userSubscriptionAddValidator, userSubscriptionGetValidator }