import { Video, VideoDetails } from '../../../shared/models/videos'
import { VideoModel } from './video'
-import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects'
+import { ActivityTagObject, ActivityUrlObject, VideoObject } from '../../../shared/models/activitypub/objects'
import { MIMETYPES, WEBSERVER } from '../../initializers/constants'
import { VideoCaptionModel } from './video-caption'
import {
MVideoFile,
MVideoFormattable,
MVideoFormattableDetails
-} from '../../typings/models'
-import { MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file'
+} from '../../types/models'
+import { MVideoFileRedundanciesOpt } from '../../types/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'
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
+ } : undefined,
+
+ // Can be added by external plugins
+ pluginData: (video as any).pluginData
}
if (options) {
})
}
+function sortByResolutionDesc (fileA: MVideoFile, fileB: MVideoFile) {
+ if (fileA.resolution < fileB.resolution) return 1
+ if (fileA.resolution === fileB.resolution) return 0
+ return -1
+}
+
function videoFilesModelToFormattedJSON (
model: MVideo | MStreamingPlaylistVideo,
baseUrlHttp: string,
): VideoFile[] {
const video = extractVideo(model)
- return videoFiles
+ return [ ...videoFiles ]
+ .filter(f => !f.isLive())
+ .sort(sortByResolutionDesc)
.map(videoFile => {
return {
resolution: {
metadataUrl: video.getVideoFileMetadataUrl(videoFile, baseUrlHttp)
} 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
- })
}
function addVideoFilesInAPAcc (
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,
}
}
-function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
+function videoModelToActivityPubObject (video: MVideoAP): VideoObject {
const { baseUrlHttp, baseUrlWs } = video.getBaseUrls()
if (!video.Tags) video.Tags = []
})
}
- // FIXME: remove and uncomment in PT 2.3
- // Breaks compatibility with PT <= 2.1
- // const icons = [ video.getMiniature(), video.getPreview() ]
- const miniature = video.getMiniature()
+ const icons = [ video.getMiniature(), video.getPreview() ]
return {
type: 'Video' as 'Video',
views: video.views,
sensitive: video.nsfw,
waitTranscoding: video.waitTranscoding,
+ isLiveBroadcast: video.isLive,
+
+ liveSaveReplay: video.isLive
+ ? video.VideoLive.saveReplay
+ : 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: {
+ icon: icons.map(i => ({
type: 'Image',
- url: miniature.getFileUrl(video),
+ url: i.getFileUrl(video),
mediaType: 'image/jpeg',
- 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
- // })),
+ width: i.width,
+ height: i.height
+ })),
url,
likes: getVideoLikesActivityPubUrl(video),
dislikes: getVideoDislikesActivityPubUrl(video),