})
}
+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 ]
+ .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 ].sort(sortByResolutionDesc)
+
+ for (const file of sortedFiles) {
acc.push({
type: 'Link',
mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] as any,
})
}
- // 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',
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),