getVideoDislikesActivityPubUrl,
getVideoLikesActivityPubUrl,
getVideoSharesActivityPubUrl
-} from '../../lib/activitypub'
+} from '../../lib/activitypub/url'
import { isArray } from '../../helpers/custom-validators/misc'
import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model'
import {
import { MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file'
import { VideoFile } from '@shared/models/videos/video-file.model'
import { generateMagnetUri } from '@server/helpers/webtorrent'
+import { extractVideo } from '@server/helpers/video'
export type VideoFormattingJSONOptions = {
completeDescription?: boolean
baseUrlWs: string,
videoFiles: MVideoFileRedundanciesOpt[]
): VideoFile[] {
+ const video = extractVideo(model)
+
return videoFiles
.map(videoFile => {
return {
torrentUrl: model.getTorrentUrl(videoFile, baseUrlHttp),
torrentDownloadUrl: model.getTorrentDownloadUrl(videoFile, baseUrlHttp),
fileUrl: model.getVideoFileUrl(videoFile, baseUrlHttp),
- fileDownloadUrl: model.getVideoFileDownloadUrl(videoFile, baseUrlHttp)
+ fileDownloadUrl: model.getVideoFileDownloadUrl(videoFile, baseUrlHttp),
+ metadataUrl: video.getVideoFileMetadataUrl(videoFile, baseUrlHttp)
} as VideoFile
})
.sort((a, b) => {
fps: file.fps
})
+ acc.push({
+ type: 'Link',
+ rel: [ 'metadata', MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] ],
+ mediaType: 'application/json' as 'application/json',
+ href: extractVideo(model).getVideoFileMetadataUrl(file, baseUrlHttp),
+ height: file.resolution,
+ fps: file.fps
+ })
+
acc.push({
type: 'Link',
mediaType: 'application/x-bittorrent' as 'application/x-bittorrent',
})
}
- const icons = [ video.getMiniature(), video.getPreview() ]
+ // FIXME: remove and uncomment in PT 2.3
+ // Breaks compatibility with PT <= 2.1
+ // const icons = [ video.getMiniature(), video.getPreview() ]
+ const miniature = video.getMiniature()
return {
type: 'Video' as 'Video',
content: video.getTruncatedDescription(),
support: video.support,
subtitleLanguage,
- icon: icons.map(i => ({
+ icon: {
type: 'Image',
- url: i.getFileUrl(video),
+ url: miniature.getFileUrl(video),
mediaType: 'image/jpeg',
- width: i.width,
- height: i.height
- })),
+ width: miniature.width,
+ height: miniature.height
+ } as any,
+ // icon: icons.map(i => ({
+ // type: 'Image',
+ // url: i.getFileUrl(video),
+ // mediaType: 'image/jpeg',
+ // width: i.width,
+ // height: i.height
+ // })),
url,
likes: getVideoLikesActivityPubUrl(video),
dislikes: getVideoDislikesActivityPubUrl(video),