X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fpagination.ts;h=17e43f743cd4e431ee11adbc71a59992ee4d0421;hb=6a4905602636afd6650c9e6f4d0fcc2105d91100;hp=2ea2a6b82c6b675c453056199639c1c61387ec3e;hpb=f05a1c30c15d2ae35c11e241ca039a72eeb7d6ad;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts index 2ea2a6b82..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 { PAGINATION_COUNT_DEFAULT } from '../initializers' +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) + 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() }