Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Prefer short uuid for embeds too

Chocobozzz327360c6b1fa
diff --git a/packages/core-utils/src/common/url.ts b/packages/core-utils/src/common/url.ts
index 93729e4088..b829ead3cc 100644
--- a/packages/core-utils/src/common/url.ts
+++ b/packages/core-utils/src/common/url.ts
@@ -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)
}
diff --git a/packages/tests/src/api/videos/video-playlists.ts b/packages/tests/src/api/videos/video-playlists.ts
index 3b0ec0d24a..d418a7b3f9 100644
--- a/packages/tests/src/api/videos/video-playlists.ts
+++ b/packages/tests/src/api/videos/video-playlists.ts
@@ -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)
diff --git a/server/core/models/video/video-playlist.ts b/server/core/models/video/video-playlist.ts
index e49d9dd90c..ba4f898b4f 100644
--- a/server/core/models/video/video-playlist.ts
+++ b/server/core/models/video/video-playlist.ts
@@ -660,7 +660,7 @@ export class VideoPlaylistModel extends SequelizeModel<VideoPlaylistModel> {
}
getEmbedStaticPath () {
- return buildPlaylistEmbedPath(this)
+ return buildPlaylistEmbedPath({ shortUUID: uuidToShort(this.uuid) })
}
static async getStats () {
diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.ts
index 72c3cccf68..cfd891a31e 100644
--- a/server/core/models/video/video.ts
+++ b/server/core/models/video/video.ts
@@ -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'>) {