X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fpagination.ts;h=17e43f743cd4e431ee11adbc71a59992ee4d0421;hb=5f3505ba78bc05fc61aeca44d95f9a954934c0fc;hp=26a8cacf0bf532d34121760eb6092a3537e95670;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts
index 26a8cacf0..17e43f743 100644
--- a/server/middlewares/pagination.ts
+++ b/server/middlewares/pagination.ts
@@ -1,14 +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'
 
-import { PAGINATION_COUNT_DEFAULT } from '../initializers'
-
-function setPagination (req: express.Request, res: express.Response, next: express.NextFunction) {
+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)
+  else req.query.start = forceNumber(req.query.start)
 
-  if (!req.query.count) req.query.count = PAGINATION_COUNT_DEFAULT
-  else req.query.count = parseInt(req.query.count, 10)
+  if (!req.query.count) req.query.count = PAGINATION.GLOBAL.COUNT.DEFAULT
+  else req.query.count = forceNumber(req.query.count)
 
   return next()
 }
@@ -16,5 +15,5 @@ function setPagination (req: express.Request, res: express.Response, next: expre
 // ---------------------------------------------------------------------------
 
 export {
-  setPagination
+  setDefaultPagination
 }