yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Fix client tests

Browse source
This commit is contained in:
Chocobozzz 2024-10-22 13:52:54 +02:00
parent 54adc6f038
commit ef1732e5b9
No known key found for this signature in database
GPG key ID: 583A612D890159BE
5 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/core/lib/html/shared/playlist-html.ts
View file

@ -115,7 +115,7 @@ export class PlaylistHtml {
forbidIndexation: !playlist.isOwned() || playlist.privacy !== VideoPlaylistPrivacy.PUBLIC,
image: playlist.Thumbnail
image: playlist.hasThumbnail()
? { url: playlist.getThumbnailUrl(), width: playlist.Thumbnail.width, height: playlist.Thumbnail.height }
: undefined,

28
server/core/lib/html/shared/tags-html.ts
View file

@ -126,7 +126,7 @@ export class TagsHtml {
}
// SEO, use origin URL
if (forbidIndexation === true && url) {
if (forbidIndexation !== true && url) {
tagsStr += `<link rel="canonical" href="${url}" />`
}
@ -145,11 +145,14 @@ export class TagsHtml {
const metaTags = {
'og:type': tags.ogType,
'og:site_name': tags.escapedSiteName,
'og:title': tags.escapedTitle,
'og:image': tags.image.url
'og:title': tags.escapedTitle
}
if (tags.image.width && tags.image.height) {
if (tags.image?.url) {
metaTags['og:image:url'] = tags.image.url
}
if (tags.image?.width && tags.image?.height) {
metaTags['og:image:width'] = tags.image.width
metaTags['og:image:height'] = tags.image.height
}
@ -183,11 +186,14 @@ export class TagsHtml {
'twitter:card': tags.twitterCard,
'twitter:site': CONFIG.SERVICES.TWITTER.USERNAME,
'twitter:title': tags.escapedTitle,
'twitter:description': tags.escapedTruncatedDescription,
'twitter:image': tags.image.url
'twitter:description': tags.escapedTruncatedDescription
}
if (tags.image.width && tags.image.height) {
if (tags.image?.url) {
metaTags['twitter:image:url'] = tags.image.url
}
if (tags.image?.width && tags.image?.height) {
metaTags['twitter:image:width'] = tags.image.width
metaTags['twitter:image:height'] = tags.image.height
}
@ -219,7 +225,7 @@ export class TagsHtml {
'@type': 'Person',
'name': tags.escapedTitle,
'description': tags.escapedTruncatedDescription,
'image': tags.image.url
'image': tags.image?.url
}
}
@ -231,13 +237,13 @@ export class TagsHtml {
'@type': tags.schemaType,
'name': tags.escapedTitle,
'description': tags.escapedTruncatedDescription,
'image': tags.image.url,
'image': tags.image?.url,
'url': tags.url
}
if (tags.list) {
schema['numberOfItems'] = tags.list.numberOfItems
schema['thumbnailUrl'] = tags.image.url
schema['thumbnailUrl'] = tags.image?.url
}
if (tags.embed) {
@ -246,7 +252,7 @@ export class TagsHtml {
if (tags.embed.duration) schema['duration'] = tags.embed.duration
schema['thumbnailUrl'] = tags.image.url
schema['thumbnailUrl'] = tags.image?.url
}
return Hooks.wrapObject(schema, 'filter:html.client.json-ld.result', context)