interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add max count in pagination

This commit is contained in:
Chocobozzz 2018-07-24 16:27:45 +02:00
parent 76dd3e89ae
commit 1194e8b46f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/initializers/constants.ts
View File

@ -21,8 +21,12 @@ const LAST_MIGRATION_VERSION = 235
// API version // API version
const API_VERSION = 'v1' const API_VERSION = 'v1'
// Number of results by default for the pagination const PAGINATION = {
const PAGINATION_COUNT_DEFAULT = 15 COUNT: {
DEFAULT: 15,
MAX: 100
}
}
// Sortable columns per schema // Sortable columns per schema
const SORTABLE_COLUMNS = { const SORTABLE_COLUMNS = {
@ -539,7 +543,7 @@ export {
OAUTH_LIFETIME, OAUTH_LIFETIME,
CUSTOM_HTML_TAG_COMMENTS, CUSTOM_HTML_TAG_COMMENTS,
BROADCAST_CONCURRENCY, BROADCAST_CONCURRENCY,
PAGINATION_COUNT_DEFAULT, PAGINATION,
ACTOR_FOLLOW_SCORE, ACTOR_FOLLOW_SCORE,
PREVIEWS_SIZE, PREVIEWS_SIZE,
REMOTE_SCHEME, REMOTE_SCHEME,

6
server/middlewares/pagination.ts
View File

@ -1,15 +1,17 @@
import 'express-validator' import 'express-validator'
import * as express from 'express' import * as express from 'express'
import { PAGINATION_COUNT_DEFAULT } from '../initializers' import { PAGINATION } from '../initializers'
function setDefaultPagination (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 if (!req.query.start) req.query.start = 0
else req.query.start = parseInt(req.query.start, 10) 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.COUNT.DEFAULT
else req.query.count = parseInt(req.query.count, 10) else req.query.count = parseInt(req.query.count, 10)
if (req.query.count > PAGINATION.COUNT.MAX) req.query.count = PAGINATION.COUNT.MAX
return next() return next()
} }