borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.1.0' into develop

Browse Source
This commit is contained in:
Chocobozzz 2020-02-04 09:20:16 +01:00
commit 7cd1b12c19
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/models/video/video-format-utils.ts
View File

@ -269,7 +269,15 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
} }
} }
const url: ActivityUrlObject[] = [] const url: ActivityUrlObject[] = [
// HTML url should be the first element in the array so Mastodon correctly displays the embed
{
type: 'Link',
mediaType: 'text/html',
href: WEBSERVER.URL + '/videos/watch/' + video.uuid
}
]
addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || []) addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || [])
for (const playlist of (video.VideoStreamingPlaylists || [])) { for (const playlist of (video.VideoStreamingPlaylists || [])) {
@ -293,13 +301,6 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
}) })
} }
// Add video url too
url.push({
type: 'Link',
mediaType: 'text/html',
href: WEBSERVER.URL + '/videos/watch/' + video.uuid
})
const subtitleLanguage = [] const subtitleLanguage = []
for (const caption of video.VideoCaptions) { for (const caption of video.VideoCaptions) {
subtitleLanguage.push({ subtitleLanguage.push({