import * as express from 'express'
-import { CONFIG, FEEDS } from '../initializers/constants'
+import { CONFIG, FEEDS, ROUTE_CACHE_LIFETIME } 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'
-import { VideoSortField } from '../../client/src/app/shared/video/sort-field.type'
+import { VideoChannelModel } from '../models/video/video-channel'
const feedsRouter = express.Router()
feedsRouter.get('/feeds/videos.:format',
videosSortValidator,
setDefaultSort,
+ asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.FEEDS)),
asyncMiddleware(feedsValidator),
- asyncMiddleware(cacheRoute),
asyncMiddleware(generateFeed)
)
const start = 0
const account: AccountModel = res.locals.account
+ const videoChannel: VideoChannelModel = res.locals.videoChannel
const hideNSFW = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
- const resultList = await VideoModel.listForApi(
+ const resultList = await VideoModel.listForApi({
start,
- FEEDS.COUNT,
- req.query.sort as VideoSortField,
+ count: FEEDS.COUNT,
+ sort: req.query.sort,
hideNSFW,
- req.query.filter,
- true,
- account ? account.id : null
- )
+ filter: req.query.filter,
+ withFiles: true,
+ accountId: account ? account.id : null,
+ videoChannelId: videoChannel ? videoChannel.id : null
+ })
// Adding video items to the feed, one at a time
resultList.data.forEach(video => {