Merge branch 'signup-hooks' into 'develop'

[github/Chocobozzz/PeerTube.git] / server / middlewares / pagination.ts

diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts
index 2ea2a6b82c6b675c453056199639c1c61387ec3e..043869303f72f0139de9dcbd377a83fbdc89e276 100644 (file)
--- a/server/middlewares/pagination.ts
+++ b/server/middlewares/pagination.ts
@@ -1,15 +1,15 @@
-import 'express-validator'
 import * as express from 'express'
-
-import { PAGINATION_COUNT_DEFAULT } from '../initializers'
+import { PAGINATION } from '../initializers/constants'
 
 function setDefaultPagination (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.query.start) req.query.start = 0
   else req.query.start = parseInt(req.query.start, 10)
 
-  if (!req.query.count) req.query.count = PAGINATION_COUNT_DEFAULT
+  if (!req.query.count) req.query.count = PAGINATION.COUNT.DEFAULT
   else req.query.count = parseInt(req.query.count, 10)
 
+  if (req.query.count > PAGINATION.COUNT.MAX) req.query.count = PAGINATION.COUNT.MAX
+
   return next()
 }