From 4282dafc826f5ca72598aa5446122eb6da3aed27 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 4 Jun 2020 15:22:08 +0200 Subject: [PATCH] Add AP icons breaking change --- server/models/video/video-format-utils.ts | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 8bc696055..89b0f5050 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -327,10 +327,7 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { }) } - // 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', @@ -355,20 +352,13 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { 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), -- 2.41.0