X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fpagination.ts;h=17e43f743cd4e431ee11adbc71a59992ee4d0421;hb=5f3505ba78bc05fc61aeca44d95f9a954934c0fc;hp=cadd769805ae7f393e14187a867db86c6d60f56d;hpb=e02643f32e4c97ca307f8fc5b69be79c40d70a3b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts index cadd76980..17e43f743 100644 --- a/server/middlewares/pagination.ts +++ b/server/middlewares/pagination.ts @@ -1,11 +1,13 @@ -import { PAGINATION_COUNT_DEFAULT } from '../initializers' +import express from 'express' +import { forceNumber } from '@shared/core-utils' +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) + 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() } @@ -13,5 +15,5 @@ function setPagination (req, res, next) { // --------------------------------------------------------------------------- export { - setPagination + setDefaultPagination }