IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prefer short uuid for embeds too

Browse Source
This commit is contained in:
Chocobozzz
2025-02-13 15:51:13 +01:00
parent d0acc7e35f
commit 327360c6b1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core-utils/src/common/url.ts
View File

@@ -47,19 +47,19 @@ function buildVideoLink (video: Pick<Video, 'shortUUID'>, base?: string) {
return (base ?? window.location.origin) + buildVideoWatchPath(video)
}
function buildPlaylistEmbedPath (playlist: Pick<VideoPlaylist, 'uuid'>) {
return '/video-playlists/embed/' + playlist.uuid
function buildPlaylistEmbedPath (playlist: Partial<Pick<VideoPlaylist, 'shortUUID' | 'uuid'>>) {
return '/video-playlists/embed/' + (playlist.shortUUID || playlist.uuid)
}
function buildPlaylistEmbedLink (playlist: Pick<VideoPlaylist, 'uuid'>, base?: string) {
function buildPlaylistEmbedLink (playlist: Partial<Pick<VideoPlaylist, 'shortUUID' | 'uuid'>>, base?: string) {
return (base ?? window.location.origin) + buildPlaylistEmbedPath(playlist)
}
function buildVideoEmbedPath (video: Pick<Video, 'uuid'>) {
return '/videos/embed/' + video.uuid
function buildVideoEmbedPath (video: Partial<Pick<Video, 'shortUUID' | 'uuid'>>) {
return '/videos/embed/' + (video.shortUUID || video.uuid)
}
function buildVideoEmbedLink (video: Pick<Video, 'uuid'>, base?: string) {
function buildVideoEmbedLink (video: Partial<Pick<Video, 'shortUUID' | 'uuid'>>, base?: string) {
return (base ?? window.location.origin) + buildVideoEmbedPath(video)
}

2
packages/tests/src/api/videos/video-playlists.ts
View File

@@ -257,7 +257,7 @@ describe('Test video playlists', function () {
expect(playlist.privacy.label).to.equal('Public')
expect(playlist.type.id).to.equal(VideoPlaylistType.REGULAR)
expect(playlist.type.label).to.equal('Regular')
expect(playlist.embedPath).to.equal('/video-playlists/embed/' + playlist.uuid)
expect(playlist.embedPath).to.equal('/video-playlists/embed/' + playlist.shortUUID)
expect(playlist.videosLength).to.equal(0)

2
server/core/models/video/video-playlist.ts
View File

@@ -660,7 +660,7 @@ export class VideoPlaylistModel extends SequelizeModel<VideoPlaylistModel> {
}
getEmbedStaticPath () {
return buildPlaylistEmbedPath(this)
return buildPlaylistEmbedPath({ shortUUID: uuidToShort(this.uuid) })
}
static async getStats () {

2
server/core/models/video/video.ts
View File

@@ -1855,7 +1855,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {
}
getEmbedStaticPath () {
return buildVideoEmbedPath(this)
return buildVideoEmbedPath({ shortUUID: uuidToShort(this.uuid) })
}
getMiniatureStaticPath (this: Pick<MVideoThumbnail, 'getMiniature' | 'Thumbnails'>) {