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 { FEEDS, ROUTE_CACHE_LIFETIME, THUMBNAILS_SIZE, WEBSERVER } from '../initializers/constants'
+import {
+ asyncMiddleware,
+ commonVideosFiltersValidator,
+ setDefaultSort,
+ videoCommentsFeedsValidator,
+ videoFeedsValidator,
+ videosSortValidator
+} from '../middlewares'
import { VideoModel } from '../models/video/video'
import * as Feed from 'pfeed'
-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'
+import { CONFIG } from '../initializers/config'
const feedsRouter = express.Router()
videosSortValidator,
setDefaultSort,
asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.FEEDS)),
+ commonVideosFiltersValidator,
asyncMiddleware(videoFeedsValidator),
asyncMiddleware(generateVideoFeed)
)
// ---------------------------------------------------------------------------
-async function generateVideoCommentsFeed (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function generateVideoCommentsFeed (req: express.Request, res: express.Response) {
const start = 0
- const video = res.locals.video as VideoModel
+ const video = res.locals.videoAll
const videoId: number = video ? video.id : undefined
const comments = await VideoCommentModel.listForFeed(start, FEEDS.COUNT, videoId)
// Adding video items to the feed, one at a time
comments.forEach(comment => {
- const link = CONFIG.WEBSERVER.URL + '/videos/watch/' + comment.Video.uuid + ';threadId=' + comment.getThreadId()
+ const link = WEBSERVER.URL + comment.getCommentStaticPath()
feed.addItem({
title: `${comment.Video.name} - ${comment.Account.getDisplayName()}`,
return sendFeed(feed, req, res)
}
-async function generateVideoFeed (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function generateVideoFeed (req: express.Request, res: express.Response) {
const start = 0
- const account: AccountModel = res.locals.account
- const videoChannel: VideoChannelModel = res.locals.videoChannel
+ const account = res.locals.account
+ const videoChannel = res.locals.videoChannel
const nsfw = buildNSFWFilter(res, req.query.nsfw)
let name: string
start,
count: FEEDS.COUNT,
sort: req.query.sort,
+ includeLocalVideos: true,
nsfw,
filter: req.query.filter,
withFiles: true,
url: videoFile.torrentUrl,
size_in_bytes: videoFile.size
}))
+ const videos = formattedVideoFiles.map(videoFile => (Object.assign({
+ type: 'video/mp4',
+ medium: 'video',
+ height: videoFile.resolution.label.replace('p', ''),
+ fileSize: videoFile.size,
+ url: videoFile.fileUrl,
+ framerate: videoFile.fps,
+ duration: video.duration
+ }, video.language ? {
+ lang: video.language
+ } : {})))
feed.addItem({
title: video.name,
id: video.url,
- link: CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid,
+ link: WEBSERVER.URL + '/videos/watch/' + video.uuid,
description: video.getTruncatedDescription(),
content: video.description,
author: [
}
],
date: video.publishedAt,
- language: video.language,
nsfw: video.nsfw,
torrent: torrents,
+ videos,
+ embed: {
+ url: video.getEmbedStaticPath(),
+ allowFullscreen: true
+ },
+ player: {
+ url: video.getWatchStaticPath()
+ },
+ categories: [video.category ? {
+ value: video.category,
+ label: VideoModel.getCategoryLabel(video.category)
+ } : null].filter(Boolean),
+ community: {
+ statistics: {
+ views: video.views
+ }
+ },
thumbnail: [
{
- url: CONFIG.WEBSERVER.URL + video.getThumbnailStaticPath(),
+ url: WEBSERVER.URL + video.getMiniatureStaticPath(),
height: THUMBNAILS_SIZE.height,
width: THUMBNAILS_SIZE.width
}
}
function initFeed (name: string, description: string) {
- const webserverUrl = CONFIG.WEBSERVER.URL
+ const webserverUrl = WEBSERVER.URL
return new Feed({
title: name,