-import * as express from 'express'
-import * as Feed from 'pfeed'
+import express from 'express'
+import { extname } from 'path'
+import { Feed } from '@peertube/feed'
+import { mdToOneLinePlainText, toSafeHtml } from '@server/helpers/markdown'
+import { getServerActor } from '@server/models/application/application'
import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils'
-import { VideoFilter } from '../../shared/models/videos/video-query.type'
+import { VideoInclude } from '@shared/models'
import { buildNSFWFilter } from '../helpers/express-utils'
import { CONFIG } from '../initializers/config'
-import { FEEDS, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants'
+import { MIMETYPES, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants'
import {
asyncMiddleware,
commonVideosFiltersValidator,
const comments = await VideoCommentModel.listForFeed({
start,
- count: FEEDS.COUNT,
+ count: CONFIG.FEEDS.COMMENTS.COUNT,
videoId: video ? video.id : undefined,
accountId: account ? account.id : undefined,
videoChannelId: videoChannel ? videoChannel.id : undefined
// Adding video items to the feed, one at a time
for (const comment of comments) {
- const link = WEBSERVER.URL + comment.getCommentStaticPath()
+ const localLink = WEBSERVER.URL + comment.getCommentStaticPath()
let title = comment.Video.name
const author: { name: string, link: string }[] = []
feed.addItem({
title,
- id: comment.url,
- link,
- content: comment.text,
+ id: localLink,
+ link: localLink,
+ content: toSafeHtml(comment.text),
author,
date: comment.createdAt
})
videoChannelId: videoChannel ? videoChannel.id : null
}
+ const server = await getServerActor()
const { data } = await VideoModel.listForApi({
start,
- count: FEEDS.COUNT,
+ count: CONFIG.FEEDS.VIDEOS.COUNT,
sort: req.query.sort,
- includeLocalVideos: true,
+ displayOnlyForFollower: {
+ actorId: server.id,
+ orLocalVideos: true
+ },
nsfw,
- filter: req.query.filter as VideoFilter,
- withFiles: true,
+ isLocal: req.query.isLocal,
+ include: req.query.include | VideoInclude.FILES,
+ hasFiles: true,
countVideos: false,
...options
})
const { data } = await VideoModel.listForApi({
start,
- count: FEEDS.COUNT,
+ count: CONFIG.FEEDS.VIDEOS.COUNT,
sort: req.query.sort,
- includeLocalVideos: false,
nsfw,
- filter: req.query.filter as VideoFilter,
- withFiles: true,
+ isLocal: req.query.isLocal,
+
+ hasFiles: true,
+ include: req.query.include | VideoInclude.FILES,
+
countVideos: false,
- followerActorId: res.locals.user.Account.Actor.id,
+ displayOnlyForFollower: {
+ actorId: res.locals.user.Account.Actor.id,
+ orLocalVideos: false
+ },
user: res.locals.user
})
return new Feed({
title: name,
- description,
+ description: mdToOneLinePlainText(description),
// updated: TODO: somehowGetLatestUpdate, // optional, default = today
id: webserverUrl,
link: webserverUrl,
})
}
-function addVideosToFeed (feed, videos: VideoModel[]) {
- /**
- * Adding video items to the feed object, one at a time
- */
+function addVideosToFeed (feed: Feed, videos: VideoModel[]) {
for (const video of videos) {
const formattedVideoFiles = video.getFormattedVideoFilesJSON(false)
size_in_bytes: videoFile.size
}))
- const videos = formattedVideoFiles.map(videoFile => {
+ const videoFiles = formattedVideoFiles.map(videoFile => {
const result = {
- type: 'video/mp4',
+ type: MIMETYPES.VIDEO.EXT_MIMETYPE[extname(videoFile.fileUrl)],
medium: 'video',
- height: videoFile.resolution.label.replace('p', ''),
+ height: videoFile.resolution.id,
fileSize: videoFile.size,
url: videoFile.fileUrl,
framerate: videoFile.fps,
})
}
+ const localLink = WEBSERVER.URL + video.getWatchStaticPath()
+
feed.addItem({
title: video.name,
- id: video.url,
- link: WEBSERVER.URL + video.getWatchStaticPath(),
- description: video.getTruncatedDescription(),
- content: video.description,
+ id: localLink,
+ link: localLink,
+ description: mdToOneLinePlainText(video.getTruncatedDescription()),
+ content: toSafeHtml(video.description),
author: [
{
name: video.VideoChannel.Account.getDisplayName(),
],
date: video.publishedAt,
nsfw: video.nsfw,
- torrent: torrents,
- videos,
+ torrents,
+
+ // Enclosure
+ video: videoFiles.length !== 0
+ ? {
+ url: videoFiles[0].url,
+ length: videoFiles[0].fileSize,
+ type: videoFiles[0].type
+ }
+ : undefined,
+
+ // Media RSS
+ videos: videoFiles,
+
embed: {
- url: video.getEmbedStaticPath(),
+ url: WEBSERVER.URL + video.getEmbedStaticPath(),
allowFullscreen: true
},
player: {
- url: video.getWatchStaticPath()
+ url: WEBSERVER.URL + video.getWatchStaticPath()
},
categories,
community: {
views: video.views
}
},
- thumbnail: [
+ thumbnails: [
{
url: WEBSERVER.URL + video.getPreviewStaticPath(),
height: PREVIEWS_SIZE.height,
}
}
-function sendFeed (feed, req: express.Request, res: express.Response) {
+function sendFeed (feed: Feed, req: express.Request, res: express.Response) {
const format = req.params.format
if (format === 'atom' || format === 'atom1') {