X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Ffeeds.ts;h=682f4abdaf873d56087f4b8b242b8afa0066e487;hb=2987c3d78bcc7e81a77d040b3121182eec8df15d;hp=ce57e5c111862fa49a2f3cea98544b8a11007034;hpb=4dae00e68b71ee3725a94eef891f3c43e10040b0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts index ce57e5c11..682f4abda 100644 --- a/server/controllers/feeds.ts +++ b/server/controllers/feeds.ts @@ -1,5 +1,6 @@ import * as express from 'express' import { CONFIG, FEEDS, ROUTE_CACHE_LIFETIME } from '../initializers/constants' +import { THUMBNAILS_SIZE } from '../initializers' import { asyncMiddleware, setDefaultSort, videoCommentsFeedsValidator, videoFeedsValidator, videosSortValidator } from '../middlewares' import { VideoModel } from '../models/video/video' import * as Feed from 'pfeed' @@ -7,6 +8,7 @@ import { AccountModel } from '../models/account/account' import { cacheRoute } from '../middlewares/cache' import { VideoChannelModel } from '../models/video/video-channel' import { VideoCommentModel } from '../models/video/video-comment' +import { buildNSFWFilter } from '../helpers/express-utils' const feedsRouter = express.Router() @@ -72,7 +74,7 @@ async function generateVideoFeed (req: express.Request, res: express.Response, n const account: AccountModel = res.locals.account const videoChannel: VideoChannelModel = res.locals.videoChannel - const hideNSFW = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list' + const nsfw = buildNSFWFilter(res, req.query.nsfw) let name: string let description: string @@ -94,7 +96,7 @@ async function generateVideoFeed (req: express.Request, res: express.Response, n start, count: FEEDS.COUNT, sort: req.query.sort, - hideNSFW, + nsfw, filter: req.query.filter, withFiles: true, accountId: account ? account.id : null, @@ -125,7 +127,14 @@ async function generateVideoFeed (req: express.Request, res: express.Response, n date: video.publishedAt, language: video.language, nsfw: video.nsfw, - torrent: torrents + torrent: torrents, + thumbnail: [ + { + url: CONFIG.WEBSERVER.URL + video.getThumbnailStaticPath(), + height: THUMBNAILS_SIZE.height, + width: THUMBNAILS_SIZE.width + } + ] }) })