aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-17 16:39:32 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-19 11:30:21 +0200
commit371906639ee9b6ea4daae504bc7c2b15856c3f38 (patch)
treea1807d7e5648a8b99565cc22daa22a1afbb34db4 /server/lib
parentb75410b87d889ae5b1704cc7f9d32a3792db9075 (diff)
downloadPeerTube-371906639ee9b6ea4daae504bc7c2b15856c3f38.tar.gz
PeerTube-371906639ee9b6ea4daae504bc7c2b15856c3f38.tar.zst
PeerTube-371906639ee9b6ea4daae504bc7c2b15856c3f38.zip
Add ability to a video multiple times in a playlist
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/activitypub/url.ts7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts
index b54e038a4..58030be2c 100644
--- a/server/lib/activitypub/url.ts
+++ b/server/lib/activitypub/url.ts
@@ -8,7 +8,8 @@ import {
8 MVideoId, 8 MVideoId,
9 MVideoUrl, 9 MVideoUrl,
10 MVideoUUID, 10 MVideoUUID,
11 MAbuseId 11 MAbuseId,
12 MVideoPlaylistElement
12} from '../../types/models' 13} from '../../types/models'
13import { MVideoPlaylist, MVideoPlaylistUUID } from '../../types/models/video/video-playlist' 14import { MVideoPlaylist, MVideoPlaylistUUID } from '../../types/models/video/video-playlist'
14import { MVideoFileVideoUUID } from '../../types/models/video/video-file' 15import { MVideoFileVideoUUID } from '../../types/models/video/video-file'
@@ -22,8 +23,8 @@ function getVideoPlaylistActivityPubUrl (videoPlaylist: MVideoPlaylist) {
22 return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid 23 return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid
23} 24}
24 25
25function getVideoPlaylistElementActivityPubUrl (videoPlaylist: MVideoPlaylistUUID, video: MVideoUUID) { 26function getVideoPlaylistElementActivityPubUrl (videoPlaylist: MVideoPlaylistUUID, videoPlaylistElement: MVideoPlaylistElement) {
26 return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid + '/' + video.uuid 27 return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid + '/videos/' + videoPlaylistElement.id
27} 28}
28 29
29function getVideoCacheFileActivityPubUrl (videoFile: MVideoFileVideoUUID) { 30function getVideoCacheFileActivityPubUrl (videoFile: MVideoFileVideoUUID) {