X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Ffeeds.ts;h=72628dffb94bc3d26a919a2971e44e3bc3d46965;hb=eb11373f9373bdeca5a1e7868f868d9ec3b2c7b6;hp=700c50ec8ac9a3260649687bc88614f968c80c5b;hpb=7b87d2d5141d0eb48db2a3fd162208d6a79b2035;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts index 700c50ec8..72628dffb 100644 --- a/server/controllers/feeds.ts +++ b/server/controllers/feeds.ts @@ -1,24 +1,49 @@ import * as express from 'express' -import { CONFIG } from '../initializers' +import { FEEDS, ROUTE_CACHE_LIFETIME, THUMBNAILS_SIZE, WEBSERVER } from '../initializers/constants' import { asyncMiddleware, - feedsValidator, - setDefaultPagination, + commonVideosFiltersValidator, setDefaultSort, - videosSortValidator + videoCommentsFeedsValidator, + videoFeedsValidator, + videosSortValidator, + feedsFormatValidator, + setFeedFormatContentType } 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 { VideoCommentModel } from '../models/video/video-comment' +import { buildNSFWFilter } from '../helpers/express-utils' +import { CONFIG } from '../initializers/config' const feedsRouter = express.Router() +feedsRouter.get('/feeds/video-comments.:format', + feedsFormatValidator, + setFeedFormatContentType, + asyncMiddleware(cacheRoute({ + headerBlacklist: [ + 'Content-Type' + ] + })(ROUTE_CACHE_LIFETIME.FEEDS)), + asyncMiddleware(videoCommentsFeedsValidator), + asyncMiddleware(generateVideoCommentsFeed) +) + feedsRouter.get('/feeds/videos.:format', videosSortValidator, setDefaultSort, - asyncMiddleware(feedsValidator), - asyncMiddleware(generateFeed) + feedsFormatValidator, + setFeedFormatContentType, + asyncMiddleware(cacheRoute({ + headerBlacklist: [ + 'Content-Type' + ] + })(ROUTE_CACHE_LIFETIME.FEEDS)), + commonVideosFiltersValidator, + asyncMiddleware(videoFeedsValidator), + asyncMiddleware(generateVideoFeed) ) // --------------------------------------------------------------------------- @@ -29,45 +54,120 @@ export { // --------------------------------------------------------------------------- -async function generateFeed (req: express.Request, res: express.Response, next: express.NextFunction) { - let feed = initFeed() - const paginationStart = 0 - const paginationCount = 20 - - let resultList: ResultList - const account: AccountModel = res.locals.account - - if (account) { - resultList = await VideoModel.listAccountVideosForApi( - account.id, - paginationStart, - paginationCount, - req.query.sort, - true - ) +async function generateVideoCommentsFeed (req: express.Request, res: express.Response) { + const start = 0 + + const video = res.locals.videoAll + const videoId: number = video ? video.id : undefined + + const comments = await VideoCommentModel.listForFeed(start, FEEDS.COUNT, videoId) + + const name = video ? video.name : CONFIG.INSTANCE.NAME + const description = video ? video.description : CONFIG.INSTANCE.DESCRIPTION + const feed = initFeed(name, description) + + // Adding video items to the feed, one at a time + comments.forEach(comment => { + const link = WEBSERVER.URL + comment.getCommentStaticPath() + + let title = comment.Video.name + const author: { name: string, link: string }[] = [] + + if (comment.Account) { + title += ` - ${comment.Account.getDisplayName()}` + author.push({ + name: comment.Account.getDisplayName(), + link: comment.Account.Actor.url + }) + } + + feed.addItem({ + title, + id: comment.url, + link, + content: comment.text, + author, + date: comment.createdAt + }) + }) + + // Now the feed generation is done, let's send it! + return sendFeed(feed, req, res) +} + +async function generateVideoFeed (req: express.Request, res: express.Response) { + const start = 0 + + const account = res.locals.account + const videoChannel = res.locals.videoChannel + const nsfw = buildNSFWFilter(res, req.query.nsfw) + + let name: string + let description: string + + if (videoChannel) { + name = videoChannel.getDisplayName() + description = videoChannel.description + } else if (account) { + name = account.getDisplayName() + description = account.description } else { - resultList = await VideoModel.listForApi( - paginationStart, - paginationCount, - req.query.sort, - req.query.filter, - true - ) + name = CONFIG.INSTANCE.NAME + description = CONFIG.INSTANCE.DESCRIPTION } + const feed = initFeed(name, description) + + const resultList = await VideoModel.listForApi({ + start, + count: FEEDS.COUNT, + sort: req.query.sort, + includeLocalVideos: true, + nsfw, + 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 => { const formattedVideoFiles = video.getFormattedVideoFilesJSON() + const torrents = formattedVideoFiles.map(videoFile => ({ title: video.name, url: videoFile.torrentUrl, size_in_bytes: videoFile.size })) + const videos = formattedVideoFiles.map(videoFile => { + const result = { + type: 'video/mp4', + medium: 'video', + height: videoFile.resolution.label.replace('p', ''), + fileSize: videoFile.size, + url: videoFile.fileUrl, + framerate: videoFile.fps, + duration: video.duration + } + + if (video.language) Object.assign(result, { lang: video.language }) + + return result + }) + + const categories: { value: number, label: string }[] = [] + if (video.category) { + categories.push({ + value: video.category, + label: VideoModel.getCategoryLabel(video.category) + }) + } + feed.addItem({ title: video.name, id: video.url, - link: video.url, + link: WEBSERVER.URL + '/videos/watch/' + video.uuid, description: video.getTruncatedDescription(), content: video.description, author: [ @@ -77,9 +177,29 @@ async function generateFeed (req: express.Request, res: express.Response, next: } ], date: video.publishedAt, - language: video.language, nsfw: video.nsfw, - torrent: torrents + torrent: torrents, + videos, + embed: { + url: video.getEmbedStaticPath(), + allowFullscreen: true + }, + player: { + url: video.getWatchStaticPath() + }, + categories, + community: { + statistics: { + views: video.views + } + }, + thumbnail: [ + { + url: WEBSERVER.URL + video.getMiniatureStaticPath(), + height: THUMBNAILS_SIZE.height, + width: THUMBNAILS_SIZE.width + } + ] }) }) @@ -87,12 +207,12 @@ async function generateFeed (req: express.Request, res: express.Response, next: return sendFeed(feed, req, res) } -function initFeed () { - const webserverUrl = CONFIG.WEBSERVER.URL +function initFeed (name: string, description: string) { + const webserverUrl = WEBSERVER.URL return new Feed({ - title: CONFIG.INSTANCE.NAME, - description: CONFIG.INSTANCE.SHORT_DESCRIPTION, + title: name, + description, // updated: TODO: somehowGetLatestUpdate, // optional, default = today id: webserverUrl, link: webserverUrl, @@ -118,26 +238,21 @@ function sendFeed (feed, req: express.Request, res: express.Response) { const format = req.params.format if (format === 'atom' || format === 'atom1') { - res.set('Content-Type', 'application/atom+xml') return res.send(feed.atom1()).end() } if (format === 'json' || format === 'json1') { - res.set('Content-Type', 'application/json') return res.send(feed.json1()).end() } if (format === 'rss' || format === 'rss2') { - res.set('Content-Type', 'application/rss+xml') return res.send(feed.rss2()).end() } // We're in the ambiguous '.xml' case and we look at the format query parameter if (req.query.format === 'atom' || req.query.format === 'atom1') { - res.set('Content-Type', 'application/atom+xml') return res.send(feed.atom1()).end() } - res.set('Content-Type', 'application/rss+xml') return res.send(feed.rss2()).end() }