From: Chocobozzz <me@florianbigard.com>
Date: Wed, 29 Jan 2020 13:41:42 +0000 (+0100)
Subject: Fix AP icon URL for imported videos
X-Git-Tag: v2.1.0~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c9a16678354f737144ce2156ce0b7e4faa97eac;p=oweals%2Fpeertube.git

Fix AP icon URL for imported videos
---

diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts
index e68a6711f..3b011b1d2 100644
--- a/server/models/video/thumbnail.ts
+++ b/server/models/video/thumbnail.ts
@@ -126,8 +126,8 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
     return videoUUID + '.jpg'
   }
 
-  getFileUrl () {
-    if (this.fileUrl) return this.fileUrl
+  getFileUrl (isLocal: boolean) {
+    if (isLocal === false) return this.fileUrl
 
     const staticPath = ThumbnailModel.types[this.type].staticPath
     return WEBSERVER.URL + staticPath + this.filename
diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts
index 9fed2d49d..2aa5b8677 100644
--- a/server/models/video/video-format-utils.ts
+++ b/server/models/video/video-format-utils.ts
@@ -338,7 +338,7 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
     subtitleLanguage,
     icon: {
       type: 'Image',
-      url: miniature.getFileUrl(),
+      url: miniature.getFileUrl(video.isOwned()),
       mediaType: 'image/jpeg',
       width: miniature.width,
       height: miniature.height