import express from 'express'
-import { Feed } from '@peertube/feed'
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 { VideoInclude } from '@shared/models'
import { buildNSFWFilter } from '../helpers/express-utils'
import { CONFIG } from '../initializers/config'
-import { FEEDS, MIMETYPES, 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,
+ id: localLink,
+ link: localLink,
content: toSafeHtml(comment.text),
author,
date: comment.createdAt
const server = await getServerActor()
const { data } = await VideoModel.listForApi({
start,
- count: FEEDS.COUNT,
+ count: CONFIG.FEEDS.VIDEOS.COUNT,
sort: req.query.sort,
displayOnlyForFollower: {
actorId: server.id,
const { data } = await VideoModel.listForApi({
start,
- count: FEEDS.COUNT,
+ count: CONFIG.FEEDS.VIDEOS.COUNT,
sort: req.query.sort,
nsfw,
size_in_bytes: videoFile.size
}))
- const videos = formattedVideoFiles.map(videoFile => {
+ const videoFiles = formattedVideoFiles.map(videoFile => {
const result = {
type: MIMETYPES.VIDEO.EXT_MIMETYPE[extname(videoFile.fileUrl)],
medium: 'video',
})
}
+ const localLink = WEBSERVER.URL + video.getWatchStaticPath()
+
feed.addItem({
title: video.name,
- id: video.url,
- link: WEBSERVER.URL + video.getWatchStaticPath(),
+ id: localLink,
+ link: localLink,
description: mdToOneLinePlainText(video.getTruncatedDescription()),
content: toSafeHtml(video.description),
author: [
torrents,
// Enclosure
- video: {
- url: videos[0].url,
- length: videos[0].fileSize,
- type: videos[0].type
- },
+ video: videoFiles.length !== 0
+ ? {
+ url: videoFiles[0].url,
+ length: videoFiles[0].fileSize,
+ type: videoFiles[0].type
+ }
+ : undefined,
// Media RSS
- videos,
+ videos: videoFiles,
embed: {
- url: video.getEmbedStaticPath(),
+ url: WEBSERVER.URL + video.getEmbedStaticPath(),
allowFullscreen: true
},
player: {
- url: video.getWatchStaticPath()
+ url: WEBSERVER.URL + video.getWatchStaticPath()
},
categories,
community: {