From ec3ce76f195467bcc4f30b0844b63f5495162f8f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 20 Dec 2022 09:25:18 +0100 Subject: [PATCH] Prefer displaying channel in rss feeds --- server/controllers/feeds.ts | 4 ++-- server/tests/feeds/feeds.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts index 772fe734d..ef810a842 100644 --- a/server/controllers/feeds.ts +++ b/server/controllers/feeds.ts @@ -285,8 +285,8 @@ function addVideosToFeed (feed: Feed, videos: VideoModel[]) { content: toSafeHtml(video.description), author: [ { - name: video.VideoChannel.Account.getDisplayName(), - link: video.VideoChannel.Account.Actor.url + name: video.VideoChannel.getDisplayName(), + link: video.VideoChannel.Actor.url } ], date: video.publishedAt, diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts index 906dab1a3..7345f728a 100644 --- a/server/tests/feeds/feeds.ts +++ b/server/tests/feeds/feeds.ts @@ -189,7 +189,7 @@ describe('Test syndication feeds', () => { const jsonObj = JSON.parse(json) expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items[0].title).to.equal('my super name for server 1') - expect(jsonObj.items[0].author.name).to.equal('root') + expect(jsonObj.items[0].author.name).to.equal('Main root channel') } { @@ -197,7 +197,7 @@ describe('Test syndication feeds', () => { const jsonObj = JSON.parse(json) expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items[0].title).to.equal('user video') - expect(jsonObj.items[0].author.name).to.equal('john') + expect(jsonObj.items[0].author.name).to.equal('Main john channel') } for (const server of servers) { @@ -223,7 +223,7 @@ describe('Test syndication feeds', () => { const jsonObj = JSON.parse(json) expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items[0].title).to.equal('my super name for server 1') - expect(jsonObj.items[0].author.name).to.equal('root') + expect(jsonObj.items[0].author.name).to.equal('Main root channel') } { @@ -231,7 +231,7 @@ describe('Test syndication feeds', () => { const jsonObj = JSON.parse(json) expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items[0].title).to.equal('user video') - expect(jsonObj.items[0].author.name).to.equal('john') + expect(jsonObj.items[0].author.name).to.equal('Main john channel') } for (const server of servers) {