Implement daily upload limit (#956)

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / search.ts

diff --git a/server/middlewares/validators/search.ts b/server/middlewares/validators/search.ts
index a97f5b581d8b280e0bf895844b5512c55a8613b0..8baf643a50d042cd6d984e5e05b95c5212cde6be 100644 (file)
--- a/server/middlewares/validators/search.ts
+++ b/server/middlewares/validators/search.ts
@@ -5,8 +5,8 @@ import { query } from 'express-validator/check'
 import { isNumberArray, isStringArray, isNSFWQueryValid } from '../../helpers/custom-validators/search'
 import { isBooleanValid, isDateValid, toArray } from '../../helpers/custom-validators/misc'
 
-const searchValidator = [
-  query('search').not().isEmpty().withMessage('Should have a valid search'),
+const videosSearchValidator = [
+  query('search').optional().not().isEmpty().withMessage('Should have a valid search'),
 
   query('startDate').optional().custom(isDateValid).withMessage('Should have a valid start date'),
   query('endDate').optional().custom(isDateValid).withMessage('Should have a valid end date'),
@@ -15,7 +15,19 @@ const searchValidator = [
   query('durationMax').optional().isInt().withMessage('Should have a valid max duration'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking search query', { parameters: req.query })
+    logger.debug('Checking videos search query', { parameters: req.query })
+
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
+
+const videoChannelsSearchValidator = [
+  query('search').not().isEmpty().withMessage('Should have a valid search'),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking video channels search query', { parameters: req.query })
 
     if (areValidationErrors(req, res)) return
 
@@ -61,5 +73,6 @@ const commonVideosFiltersValidator = [
 
 export {
   commonVideosFiltersValidator,
-  searchValidator
+  videoChannelsSearchValidator,
+  videosSearchValidator
 }