ActivityPub-federated video streaming platform using P2P directly in your web browser
Handle non-jpg remote thumbnails
Chocobozzze136d1683ca1
diff --git a/server/core/helpers/custom-validators/activitypub/videos.ts b/server/core/helpers/custom-validators/activitypub/videos.tsindex 380815a539..8c865a4e0f 100644--- a/server/core/helpers/custom-validators/activitypub/videos.ts+++ b/server/core/helpers/custom-validators/activitypub/videos.ts@@ -212,7 +212,7 @@ function setValidRemoteIcon (video: any) {video.icon = video.icon.filter(icon => {return icon.type === 'Image' &&isActivityPubUrlValid(icon.url) &&- icon.mediaType === 'image/jpeg' &&+ !!MIMETYPES.IMAGE.MIMETYPE_EXT[icon.mediaType] &&validator.default.isInt(icon.width + '', { min: 0 }) &&validator.default.isInt(icon.height + '', { min: 0 })})@@ -253,12 +253,12 @@ function setValidStoryboard (video: VideoObject) {if (!video.preview) return trueif (!Array.isArray(video.preview)) return false- video.preview = video.preview.filter(p => isStorybordValid(p))+ video.preview = video.preview.filter(p => isStoryboardValid(p))return true}-function isStorybordValid (preview: ActivityPubStoryboard) {+function isStoryboardValid (preview: ActivityPubStoryboard) {if (!preview) return falseif (@@ -270,7 +270,7 @@ function isStorybordValid (preview: ActivityPubStoryboard) {}preview.url = preview.url.filter(u => {- return u.mediaType === 'image/jpeg' &&+ return !!MIMETYPES.IMAGE.MIMETYPE_EXT[u.mediaType] &&isActivityPubUrlValid(u.href) &&validator.default.isInt(u.width + '', { min: 0 }) &&validator.default.isInt(u.height + '', { min: 0 }) &&diff --git a/server/core/lib/activitypub/videos/shared/object-to-model-attributes.ts b/server/core/lib/activitypub/videos/shared/object-to-model-attributes.tsindex e89a915f75..b6059897cf 100644--- a/server/core/lib/activitypub/videos/shared/object-to-model-attributes.ts+++ b/server/core/lib/activitypub/videos/shared/object-to-model-attributes.ts@@ -235,7 +235,7 @@ export function getStoryboardAttributeFromObject (video: MVideoId, videoObject:const storyboard = videoObject.preview.find(p => p.rel.includes('storyboard'))if (!storyboard) return undefined- const url = arrayify(storyboard.url).find(u => u.mediaType === 'image/jpeg')+ const url = arrayify(storyboard.url).find(u => MIMETYPES.IMAGE.MIMETYPE_EXT[u.mediaType])return {filename: generateImageFilename(extname(url.href)),