+import { generateMagnetUri } from '@server/helpers/webtorrent'
+import { getLocalVideoFileMetadataUrl } from '@server/lib/video-paths'
+import { VideoFile } from '@shared/models/videos/video-file.model'
+import { ActivityTagObject, ActivityUrlObject, VideoObject } from '../../../shared/models/activitypub/objects'
import { Video, VideoDetails } from '../../../shared/models/videos'
-import { VideoModel } from './video'
-import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects'
+import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model'
+import { isArray } from '../../helpers/custom-validators/misc'
import { MIMETYPES, WEBSERVER } from '../../initializers/constants'
-import { VideoCaptionModel } from './video-caption'
import {
- getVideoCommentsActivityPubUrl,
- getVideoDislikesActivityPubUrl,
- getVideoLikesActivityPubUrl,
- getVideoSharesActivityPubUrl
-} from '../../lib/activitypub'
-import { isArray } from '../../helpers/custom-validators/misc'
-import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model'
+ getLocalVideoCommentsActivityPubUrl,
+ getLocalVideoDislikesActivityPubUrl,
+ getLocalVideoLikesActivityPubUrl,
+ getLocalVideoSharesActivityPubUrl
+} from '../../lib/activitypub/url'
import {
MStreamingPlaylistRedundanciesOpt,
MStreamingPlaylistVideo,
MVideoAP,
MVideoFile,
MVideoFormattable,
- MVideoFormattableDetails
-} from '../../typings/models'
-import { MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file'
-import { VideoFile } from '@shared/models/videos/video-file.model'
-import { generateMagnetUri } from '@server/helpers/webtorrent'
+ MVideoFormattableDetails,
+ MVideoWithHost
+} from '../../types/models'
+import { MVideoFileRedundanciesOpt } from '../../types/models/video/video-file'
+import { VideoModel } from './video'
+import { VideoCaptionModel } from './video-caption'
export type VideoFormattingJSONOptions = {
completeDescription?: boolean
label: VideoModel.getPrivacyLabel(video.privacy)
},
nsfw: video.nsfw,
- description: options && options.completeDescription === true ? video.description : video.getTruncatedDescription(),
+
+ description: options && options.completeDescription === true
+ ? video.description
+ : video.getTruncatedDescription(),
+
isLocal: video.isOwned(),
duration: video.duration,
views: video.views,
publishedAt: video.publishedAt,
originallyPublishedAt: video.originallyPublishedAt,
+ isLive: video.isLive,
+
account: video.VideoChannel.Account.toFormattedSummaryJSON(),
channel: video.VideoChannel.toFormattedSummaryJSON(),
- userHistory: userHistory ? {
- currentTime: userHistory.currentTime
- } : undefined
+ userHistory: userHistory
+ ? { currentTime: userHistory.currentTime }
+ : undefined,
+
+ // Can be added by external plugins
+ pluginData: (video as any).pluginData
}
if (options) {
}
// Format and sort video files
- detailsJson.files = videoFilesModelToFormattedJSON(video, baseUrlHttp, baseUrlWs, video.VideoFiles)
+ detailsJson.files = videoFilesModelToFormattedJSON(video, video, baseUrlHttp, baseUrlWs, video.VideoFiles)
return Object.assign(formattedJson, detailsJson)
}
-function streamingPlaylistsModelToFormattedJSON (video: MVideo, playlists: MStreamingPlaylistRedundanciesOpt[]): VideoStreamingPlaylist[] {
+function streamingPlaylistsModelToFormattedJSON (
+ video: MVideoFormattableDetails,
+ playlists: MStreamingPlaylistRedundanciesOpt[]
+): VideoStreamingPlaylist[] {
if (isArray(playlists) === false) return []
const { baseUrlHttp, baseUrlWs } = video.getBaseUrls()
? playlist.RedundancyVideos.map(r => ({ baseUrl: r.fileUrl }))
: []
- const files = videoFilesModelToFormattedJSON(playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles)
+ const files = videoFilesModelToFormattedJSON(playlistWithVideo, video, baseUrlHttp, baseUrlWs, playlist.VideoFiles)
return {
id: playlist.id,
})
}
+function sortByResolutionDesc (fileA: MVideoFile, fileB: MVideoFile) {
+ if (fileA.resolution < fileB.resolution) return 1
+ if (fileA.resolution === fileB.resolution) return 0
+ return -1
+}
+
+// FIXME: refactor/merge model and video arguments
function videoFilesModelToFormattedJSON (
model: MVideo | MStreamingPlaylistVideo,
+ video: MVideoFormattableDetails,
baseUrlHttp: string,
baseUrlWs: string,
videoFiles: MVideoFileRedundanciesOpt[]
): VideoFile[] {
- return videoFiles
+ return [ ...videoFiles ]
+ .filter(f => !f.isLive())
+ .sort(sortByResolutionDesc)
.map(videoFile => {
return {
resolution: {
id: videoFile.resolution,
label: videoFile.resolution + 'p'
},
- magnetUri: generateMagnetUri(model, videoFile, baseUrlHttp, baseUrlWs),
+
+ // FIXME: deprecated in 3.2
+ magnetUri: generateMagnetUri(model, video, videoFile, baseUrlHttp, baseUrlWs),
+
size: videoFile.size,
fps: videoFile.fps,
- torrentUrl: model.getTorrentUrl(videoFile, baseUrlHttp),
- torrentDownloadUrl: model.getTorrentDownloadUrl(videoFile, baseUrlHttp),
- fileUrl: model.getVideoFileUrl(videoFile, baseUrlHttp),
- fileDownloadUrl: model.getVideoFileDownloadUrl(videoFile, baseUrlHttp)
+
+ torrentUrl: videoFile.getTorrentUrl(),
+ torrentDownloadUrl: videoFile.getTorrentDownloadUrl(),
+
+ fileUrl: videoFile.getFileUrl(video),
+ fileDownloadUrl: videoFile.getFileDownloadUrl(video),
+
+ metadataUrl: videoFile.metadataUrl ?? getLocalVideoFileMetadataUrl(video, videoFile)
} as VideoFile
})
- .sort((a, b) => {
- if (a.resolution.id < b.resolution.id) return 1
- if (a.resolution.id === b.resolution.id) return 0
- return -1
- })
}
+// FIXME: refactor/merge model and video arguments
function addVideoFilesInAPAcc (
acc: ActivityUrlObject[] | ActivityTagObject[],
model: MVideoAP | MStreamingPlaylistVideo,
+ video: MVideoWithHost,
baseUrlHttp: string,
baseUrlWs: string,
files: MVideoFile[]
) {
- for (const file of files) {
+ const sortedFiles = [ ...files ]
+ .filter(f => !f.isLive())
+ .sort(sortByResolutionDesc)
+
+ for (const file of sortedFiles) {
acc.push({
type: 'Link',
mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] as any,
- href: model.getVideoFileUrl(file, baseUrlHttp),
+ href: file.getFileUrl(video),
height: file.resolution,
size: file.size,
fps: file.fps
})
+ acc.push({
+ type: 'Link',
+ rel: [ 'metadata', MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] ],
+ mediaType: 'application/json' as 'application/json',
+ href: getLocalVideoFileMetadataUrl(video, file),
+ height: file.resolution,
+ fps: file.fps
+ })
+
acc.push({
type: 'Link',
mediaType: 'application/x-bittorrent' as 'application/x-bittorrent',
- href: model.getTorrentUrl(file, baseUrlHttp),
+ href: file.getTorrentUrl(),
height: file.resolution
})
acc.push({
type: 'Link',
mediaType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet',
- href: generateMagnetUri(model, file, baseUrlHttp, baseUrlWs),
+ href: generateMagnetUri(model, video, file, baseUrlHttp, baseUrlWs),
height: file.resolution
})
}
}
-function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
+function videoModelToActivityPubObject (video: MVideoAP): VideoObject {
const { baseUrlHttp, baseUrlWs } = video.getBaseUrls()
if (!video.Tags) video.Tags = []
}
]
- addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || [])
+ addVideoFilesInAPAcc(url, video, video, baseUrlHttp, baseUrlWs, video.VideoFiles || [])
for (const playlist of (video.VideoStreamingPlaylists || [])) {
const tag = playlist.p2pMediaLoaderInfohashes
})
const playlistWithVideo = Object.assign(playlist, { Video: video })
- addVideoFilesInAPAcc(tag, playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles || [])
+ addVideoFilesInAPAcc(tag, playlistWithVideo, video, baseUrlHttp, baseUrlWs, playlist.VideoFiles || [])
url.push({
type: 'Link',
views: video.views,
sensitive: video.nsfw,
waitTranscoding: video.waitTranscoding,
+ isLiveBroadcast: video.isLive,
+
+ liveSaveReplay: video.isLive
+ ? video.VideoLive.saveReplay
+ : null,
+
+ permanentLive: video.isLive
+ ? video.VideoLive.permanentLive
+ : null,
+
state: video.state,
commentsEnabled: video.commentsEnabled,
downloadEnabled: video.downloadEnabled,
published: video.publishedAt.toISOString(),
- originallyPublishedAt: video.originallyPublishedAt ? video.originallyPublishedAt.toISOString() : null,
+
+ originallyPublishedAt: video.originallyPublishedAt
+ ? video.originallyPublishedAt.toISOString()
+ : null,
+
updated: video.updatedAt.toISOString(),
mediaType: 'text/markdown',
- content: video.getTruncatedDescription(),
+ content: video.description,
support: video.support,
subtitleLanguage,
icon: icons.map(i => ({
height: i.height
})),
url,
- likes: getVideoLikesActivityPubUrl(video),
- dislikes: getVideoDislikesActivityPubUrl(video),
- shares: getVideoSharesActivityPubUrl(video),
- comments: getVideoCommentsActivityPubUrl(video),
+ likes: getLocalVideoLikesActivityPubUrl(video),
+ dislikes: getLocalVideoDislikesActivityPubUrl(video),
+ shares: getLocalVideoSharesActivityPubUrl(video),
+ comments: getLocalVideoCommentsActivityPubUrl(video),
attributedTo: [
{
type: 'Person',
projects / github / Chocobozzz / PeerTube.git / blobdiff