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

Fix oembed for playlists

pull/4283/head
Chocobozzz 2021-07-27 17:37:59 +02:00
parent 29837f8885
commit a892c54a82
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/client-html.ts
View File

@ -162,7 +162,7 @@ class ClientHtml {
let customHtml = ClientHtml.addTitleTag(html, escapeHTML(videoPlaylist.name)) let customHtml = ClientHtml.addTitleTag(html, escapeHTML(videoPlaylist.name))
customHtml = ClientHtml.addDescriptionTag(customHtml, mdToPlainText(videoPlaylist.description)) customHtml = ClientHtml.addDescriptionTag(customHtml, mdToPlainText(videoPlaylist.description))
const url = videoPlaylist.getWatchStaticPath() const url = WEBSERVER.URL + videoPlaylist.getWatchStaticPath()
const originUrl = videoPlaylist.url const originUrl = videoPlaylist.url
const title = escapeHTML(videoPlaylist.name) const title = escapeHTML(videoPlaylist.name)
const siteName = escapeHTML(CONFIG.INSTANCE.NAME) const siteName = escapeHTML(CONFIG.INSTANCE.NAME)

8
server/tests/client.ts
View File

@ -119,7 +119,7 @@ describe('Test a client controllers', function () {
const port = servers[0].port const port = servers[0].port
const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' + const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
`url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2F${servers[0].store.video.uuid}" ` + `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2F${servers[0].store.video.shortUUID}" ` +
`title="${servers[0].store.video.name}" />` `title="${servers[0].store.video.name}" />`
expect(res.text).to.contain(expectedLink) expect(res.text).to.contain(expectedLink)
@ -140,7 +140,7 @@ describe('Test a client controllers', function () {
const port = servers[0].port const port = servers[0].port
const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' + const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
`url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2Fp%2F${playlist.uuid}" ` + `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2Fp%2F${playlist.shortUUID}" ` +
`title="${playlistName}" />` `title="${playlistName}" />`
expect(res.text).to.contain(expectedLink) expect(res.text).to.contain(expectedLink)
@ -178,7 +178,7 @@ describe('Test a client controllers', function () {
expect(text).to.contain(`<meta property="og:title" content="${videoName}" />`) expect(text).to.contain(`<meta property="og:title" content="${videoName}" />`)
expect(text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`) expect(text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
expect(text).to.contain('<meta property="og:type" content="video" />') expect(text).to.contain('<meta property="og:type" content="video" />')
expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/${servers[0].store.video.uuid}" />`) expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/${servers[0].store.video.shortUUID}" />`)
} }
async function watchPlaylistPageTest (path: string) { async function watchPlaylistPageTest (path: string) {
@ -188,7 +188,7 @@ describe('Test a client controllers', function () {
expect(text).to.contain(`<meta property="og:title" content="${playlistName}" />`) expect(text).to.contain(`<meta property="og:title" content="${playlistName}" />`)
expect(text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`) expect(text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`)
expect(text).to.contain('<meta property="og:type" content="video" />') expect(text).to.contain('<meta property="og:type" content="video" />')
expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/p/${playlist.uuid}" />`) expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/p/${playlist.shortUUID}" />`)
} }
it('Should have valid Open Graph tags on the account page', async function () { it('Should have valid Open Graph tags on the account page', async function () {