Add videos list filters

2 files changed, 46 insertions, 2 deletions

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 6307ee154..8a62c8be6 100644
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -9,7 +9,7 @@ function setDefaultSort (req: express.Request, res: express.Response, next: expr
 }
 
 function setDefaultSearchSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-bestmatch'
+  if (!req.query.sort) req.query.sort = '-match'
 
   return next()
 }
diff --git a/server/middlewares/validators/search.ts b/server/middlewares/validators/search.ts
index 774845e8a..fb2148eb3 100644
--- a/server/middlewares/validators/search.ts
+++ b/server/middlewares/validators/search.ts
@@ -2,12 +2,55 @@ import * as express from 'express'
 import { areValidationErrors } from './utils'
 import { logger } from '../../helpers/logger'
 import { query } from 'express-validator/check'
+import { isNumberArray, isStringArray } 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'),
 
+  query('startDate').optional().custom(isDateValid).withMessage('Should have a valid start date'),
+  query('endDate').optional().custom(isDateValid).withMessage('Should have a valid end date'),
+
+  query('durationMin').optional().isInt().withMessage('Should have a valid min duration'),
+  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 })
+
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
+
+const commonVideosFiltersValidator = [
+  query('categoryOneOf')
+    .optional()
+    .customSanitizer(toArray)
+    .custom(isNumberArray).withMessage('Should have a valid one of category array'),
+  query('licenceOneOf')
+    .optional()
+    .customSanitizer(toArray)
+    .custom(isNumberArray).withMessage('Should have a valid one of licence array'),
+  query('languageOneOf')
+    .optional()
+    .customSanitizer(toArray)
+    .custom(isStringArray).withMessage('Should have a valid one of language array'),
+  query('tagsOneOf')
+    .optional()
+    .customSanitizer(toArray)
+    .custom(isStringArray).withMessage('Should have a valid one of tags array'),
+  query('tagsAllOf')
+    .optional()
+    .customSanitizer(toArray)
+    .custom(isStringArray).withMessage('Should have a valid all of tags array'),
+  query('nsfw')
+    .optional()
+    .toBoolean()
+    .custom(isBooleanValid).withMessage('Should have a valid NSFW attribute'),
+
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking search parameters', { parameters: req.params })
+    logger.debug('Checking commons video filters query', { parameters: req.query })
 
     if (areValidationErrors(req, res)) return
 
@@ -18,5 +61,6 @@ const searchValidator = [
 // ---------------------------------------------------------------------------
 
 export {
+  commonVideosFiltersValidator,
   searchValidator
 }