From 4195cd2bc5046d4cdf1c677c27cd41f427d7a13a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 17 Apr 2018 14:01:06 +0200 Subject: Add redis cache to feed route --- server/controllers/feeds.ts | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts index 700c50ec8..3e384c48a 100644 --- a/server/controllers/feeds.ts +++ b/server/controllers/feeds.ts @@ -1,16 +1,11 @@ import * as express from 'express' -import { CONFIG } from '../initializers' -import { - asyncMiddleware, - feedsValidator, - setDefaultPagination, - setDefaultSort, - videosSortValidator -} from '../middlewares' +import { CONFIG, FEEDS } from '../initializers/constants' +import { asyncMiddleware, feedsValidator, setDefaultSort, videosSortValidator } from '../middlewares' import { VideoModel } from '../models/video/video' import * as Feed from 'pfeed' import { ResultList } from '../../shared/models' import { AccountModel } from '../models/account/account' +import { cacheRoute } from '../middlewares/cache' const feedsRouter = express.Router() @@ -18,6 +13,7 @@ feedsRouter.get('/feeds/videos.:format', videosSortValidator, setDefaultSort, asyncMiddleware(feedsValidator), + asyncMiddleware(cacheRoute), asyncMiddleware(generateFeed) ) @@ -31,8 +27,7 @@ export { async function generateFeed (req: express.Request, res: express.Response, next: express.NextFunction) { let feed = initFeed() - const paginationStart = 0 - const paginationCount = 20 + const start = 0 let resultList: ResultList const account: AccountModel = res.locals.account @@ -40,15 +35,15 @@ async function generateFeed (req: express.Request, res: express.Response, next: if (account) { resultList = await VideoModel.listAccountVideosForApi( account.id, - paginationStart, - paginationCount, + start, + FEEDS.COUNT, req.query.sort, true ) } else { resultList = await VideoModel.listForApi( - paginationStart, - paginationCount, + start, + FEEDS.COUNT, req.query.sort, req.query.filter, true -- cgit v1.2.3