aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-14 11:25:19 +0200
committerChocobozzz <me@florianbigard.com>2018-06-14 11:25:19 +0200
commit4dae00e68b71ee3725a94eef891f3c43e10040b0 (patch)
treedda4315d5e51b7b41e5599fe5e30a6f291f13314
parent3d5de919f382bb86b00678530ee22ae52c2add6b (diff)
downloadPeerTube-4dae00e68b71ee3725a94eef891f3c43e10040b0.tar.gz
PeerTube-4dae00e68b71ee3725a94eef891f3c43e10040b0.tar.zst
PeerTube-4dae00e68b71ee3725a94eef891f3c43e10040b0.zip
Use local object URLs for feeds
-rw-r--r--server/controllers/feeds.ts6
-rw-r--r--server/models/video/video-comment.ts2
2 files changed, 5 insertions, 3 deletions
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index ece5dc067..ce57e5c11 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -46,10 +46,12 @@ async function generateVideoCommentsFeed (req: express.Request, res: express.Res
46 46
47 // Adding video items to the feed, one at a time 47 // Adding video items to the feed, one at a time
48 comments.forEach(comment => { 48 comments.forEach(comment => {
49 const link = CONFIG.WEBSERVER.URL + '/videos/watch/' + comment.Video.uuid + ';threadId=' + comment.getThreadId()
50
49 feed.addItem({ 51 feed.addItem({
50 title: `${comment.Video.name} - ${comment.Account.getDisplayName()}`, 52 title: `${comment.Video.name} - ${comment.Account.getDisplayName()}`,
51 id: comment.url, 53 id: comment.url,
52 link: comment.url, 54 link,
53 content: comment.text, 55 content: comment.text,
54 author: [ 56 author: [
55 { 57 {
@@ -111,7 +113,7 @@ async function generateVideoFeed (req: express.Request, res: express.Response, n
111 feed.addItem({ 113 feed.addItem({
112 title: video.name, 114 title: video.name,
113 id: video.url, 115 id: video.url,
114 link: video.url, 116 link: CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid,
115 description: video.getTruncatedDescription(), 117 description: video.getTruncatedDescription(),
116 content: video.description, 118 content: video.description,
117 author: [ 119 author: [
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 86766a5d1..f93d81d67 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -348,7 +348,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
348 where: {}, 348 where: {},
349 include: [ 349 include: [
350 { 350 {
351 attributes: [ 'name' ], 351 attributes: [ 'name', 'uuid' ],
352 model: VideoModel.unscoped(), 352 model: VideoModel.unscoped(),
353 required: true 353 required: true
354 } 354 }