From fbd67e7f386504e50f2504cb6386700a58906f16 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Jul 2021 16:40:21 +0200 Subject: Add ability to search by uuids/actor names --- server/middlewares/validators/search.ts | 34 ++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/search.ts b/server/middlewares/validators/search.ts index ea6a490b2..cde300968 100644 --- a/server/middlewares/validators/search.ts +++ b/server/middlewares/validators/search.ts @@ -2,7 +2,7 @@ import * as express from 'express' import { query } from 'express-validator' import { isSearchTargetValid } from '@server/helpers/custom-validators/search' import { isHostValid } from '@server/helpers/custom-validators/servers' -import { isDateValid } from '../../helpers/custom-validators/misc' +import { areUUIDsValid, isDateValid, toCompleteUUIDs } from '../../helpers/custom-validators/misc' import { logger } from '../../helpers/logger' import { areValidationErrors } from './shared' @@ -27,8 +27,18 @@ const videosSearchValidator = [ .optional() .custom(isDateValid).withMessage('Should have a published end date that conforms to ISO 8601'), - query('durationMin').optional().isInt().withMessage('Should have a valid min duration'), - query('durationMax').optional().isInt().withMessage('Should have a valid max duration'), + query('durationMin') + .optional() + .isInt().withMessage('Should have a valid min duration'), + query('durationMax') + .optional() + .isInt().withMessage('Should have a valid max duration'), + + query('uuids') + .optional() + .toArray() + .customSanitizer(toCompleteUUIDs) + .custom(areUUIDsValid).withMessage('Should have valid uuids'), query('searchTarget').optional().custom(isSearchTargetValid).withMessage('Should have a valid search target'), @@ -42,7 +52,9 @@ const videosSearchValidator = [ ] const videoChannelsListSearchValidator = [ - query('search').not().isEmpty().withMessage('Should have a valid search'), + query('search') + .optional() + .not().isEmpty().withMessage('Should have a valid search'), query('host') .optional() @@ -52,6 +64,10 @@ const videoChannelsListSearchValidator = [ .optional() .custom(isSearchTargetValid).withMessage('Should have a valid search target'), + query('names') + .optional() + .toArray(), + (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking video channels search query', { parameters: req.query }) @@ -62,7 +78,9 @@ const videoChannelsListSearchValidator = [ ] const videoPlaylistsListSearchValidator = [ - query('search').not().isEmpty().withMessage('Should have a valid search'), + query('search') + .optional() + .not().isEmpty().withMessage('Should have a valid search'), query('host') .optional() @@ -72,6 +90,12 @@ const videoPlaylistsListSearchValidator = [ .optional() .custom(isSearchTargetValid).withMessage('Should have a valid search target'), + query('uuids') + .optional() + .toArray() + .customSanitizer(toCompleteUUIDs) + .custom(areUUIDsValid).withMessage('Should have valid uuids'), + (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking video playlists search query', { parameters: req.query }) -- cgit v1.2.3