OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Prefer displaying channel in rss feeds

pull/5486/head
Chocobozzz 2022-12-20 09:25:18 +01:00
parent 868314e8bf
commit ec3ce76f19
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/controllers/feeds.ts
View File

@ -285,8 +285,8 @@ function addVideosToFeed (feed: Feed, videos: VideoModel[]) {
content: toSafeHtml(video.description), content: toSafeHtml(video.description),
author: [ author: [
{ {
name: video.VideoChannel.Account.getDisplayName(), name: video.VideoChannel.getDisplayName(),
link: video.VideoChannel.Account.Actor.url link: video.VideoChannel.Actor.url
} }
], ],
date: video.publishedAt, date: video.publishedAt,

8
server/tests/feeds/feeds.ts
View File

@ -189,7 +189,7 @@ describe('Test syndication feeds', () => {
const jsonObj = JSON.parse(json) const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1) 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].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) const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items.length).to.be.equal(1)
expect(jsonObj.items[0].title).to.equal('user video') 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) { for (const server of servers) {
@ -223,7 +223,7 @@ describe('Test syndication feeds', () => {
const jsonObj = JSON.parse(json) const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1) 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].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) const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1) expect(jsonObj.items.length).to.be.equal(1)
expect(jsonObj.items[0].title).to.equal('user video') 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) { for (const server of servers) {