forks
/
peertube
1
0
Fork 0
Code Releases Activity

Use local URL for feed guid

This commit is contained in:
Chocobozzz 2022-02-22 11:14:34 +01:00
parent ebee0c0427
commit bdb54e6f8c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/controllers/feeds.ts
View File

@ -104,7 +104,7 @@ async function generateVideoCommentsFeed (req: express.Request, res: express.Res
// Adding video items to the feed, one at a time // Adding video items to the feed, one at a time
for (const comment of comments) { for (const comment of comments) {
const link = WEBSERVER.URL + comment.getCommentStaticPath() const localLink = WEBSERVER.URL + comment.getCommentStaticPath()
let title = comment.Video.name let title = comment.Video.name
const author: { name: string, link: string }[] = [] const author: { name: string, link: string }[] = []
@ -119,8 +119,8 @@ async function generateVideoCommentsFeed (req: express.Request, res: express.Res
feed.addItem({ feed.addItem({
title, title,
id: comment.url, id: localLink,
link, link: localLink,
content: toSafeHtml(comment.text), content: toSafeHtml(comment.text),
author, author,
date: comment.createdAt date: comment.createdAt
@ -269,7 +269,7 @@ function addVideosToFeed (feed: Feed, videos: VideoModel[]) {
size_in_bytes: videoFile.size size_in_bytes: videoFile.size
})) }))
const videos = formattedVideoFiles.map(videoFile => { const videoFiles = formattedVideoFiles.map(videoFile => {
const result = { const result = {
type: MIMETYPES.VIDEO.EXT_MIMETYPE[extname(videoFile.fileUrl)], type: MIMETYPES.VIDEO.EXT_MIMETYPE[extname(videoFile.fileUrl)],
medium: 'video', medium: 'video',
@ -293,10 +293,12 @@ function addVideosToFeed (feed: Feed, videos: VideoModel[]) {
}) })
} }
const localLink = WEBSERVER.URL + video.getWatchStaticPath()
feed.addItem({ feed.addItem({
title: video.name, title: video.name,
id: video.url, id: localLink,
link: WEBSERVER.URL + video.getWatchStaticPath(), link: localLink,
description: mdToOneLinePlainText(video.getTruncatedDescription()), description: mdToOneLinePlainText(video.getTruncatedDescription()),
content: toSafeHtml(video.description), content: toSafeHtml(video.description),
author: [ author: [
@ -311,20 +313,20 @@ function addVideosToFeed (feed: Feed, videos: VideoModel[]) {
// Enclosure // Enclosure
video: { video: {
url: videos[0].url, url: videoFiles[0].url,
length: videos[0].fileSize, length: videoFiles[0].fileSize,
type: videos[0].type type: videoFiles[0].type
}, },
// Media RSS // Media RSS
videos, videos: videoFiles,
embed: { embed: {
url: video.getEmbedStaticPath(), url: WEBSERVER.URL + video.getEmbedStaticPath(),
allowFullscreen: true allowFullscreen: true
}, },
player: { player: {
url: video.getWatchStaticPath() url: WEBSERVER.URL + video.getWatchStaticPath()
}, },
categories, categories,
community: { community: {