Merge branch 'release/3.2.0' into develop

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

diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts
index cadd769805ae7f393e14187a867db86c6d60f56d..b59717d7bc46edf541f7418549df124201d842bd 100644 (file)
--- a/server/middlewares/pagination.ts
+++ b/server/middlewares/pagination.ts
@@ -1,10 +1,11 @@
-import { PAGINATION_COUNT_DEFAULT } from '../initializers'
+import * as express from 'express'
+import { PAGINATION } from '../initializers/constants'
 
-function setPagination (req, res, next) {
+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.GLOBAL.COUNT.DEFAULT
   else req.query.count = parseInt(req.query.count, 10)
 
   return next()
@@ -13,5 +14,5 @@ function setPagination (req, res, next) {
 // ---------------------------------------------------------------------------
 
 export {
-  setPagination
+  setDefaultPagination
 }