Add TMP persistent directory

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

diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts
index 83304940f38af1bc386e045717375b1dab47af3d..17e43f743cd4e431ee11adbc71a59992ee4d0421 100644 (file)
--- a/server/middlewares/pagination.ts
+++ b/server/middlewares/pagination.ts
@@ -1,16 +1,13 @@
-import 'express-validator'
-import * as express from 'express'
-
+import express from 'express'
+import { forceNumber } from '@shared/core-utils'
 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
-  else req.query.count = parseInt(req.query.count, 10)
+  else req.query.start = forceNumber(req.query.start)
 
-  if (req.query.count > PAGINATION.COUNT.MAX) req.query.count = PAGINATION.COUNT.MAX
+  if (!req.query.count) req.query.count = PAGINATION.GLOBAL.COUNT.DEFAULT
+  else req.query.count = forceNumber(req.query.count)
 
   return next()
 }