aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-01-29 14:42:02 +0100
committerChocobozzz <me@florianbigard.com>2020-01-29 14:42:02 +0100
commitd5692d4088cdd9fde3be6ff34be8ce2816dab0cf (patch)
treee221a976773fd4365903f9bbf5e251cb729d211d /server
parentcf59a2a0c367683ba35758419499bf6087c192ec (diff)
parent9c9a16678354f737144ce2156ce0b7e4faa97eac (diff)
downloadPeerTube-d5692d4088cdd9fde3be6ff34be8ce2816dab0cf.tar.gz
PeerTube-d5692d4088cdd9fde3be6ff34be8ce2816dab0cf.tar.zst
PeerTube-d5692d4088cdd9fde3be6ff34be8ce2816dab0cf.zip
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'server')
-rw-r--r--server/models/video/thumbnail.ts4
-rw-r--r--server/models/video/video-format-utils.ts2
2 files changed, 3 insertions, 3 deletions
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> {
126 return videoUUID + '.jpg' 126 return videoUUID + '.jpg'
127 } 127 }
128 128
129 getFileUrl () { 129 getFileUrl (isLocal: boolean) {
130 if (this.fileUrl) return this.fileUrl 130 if (isLocal === false) return this.fileUrl
131 131
132 const staticPath = ThumbnailModel.types[this.type].staticPath 132 const staticPath = ThumbnailModel.types[this.type].staticPath
133 return WEBSERVER.URL + staticPath + this.filename 133 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 {
338 subtitleLanguage, 338 subtitleLanguage,
339 icon: { 339 icon: {
340 type: 'Image', 340 type: 'Image',
341 url: miniature.getFileUrl(), 341 url: miniature.getFileUrl(video.isOwned()),
342 mediaType: 'image/jpeg', 342 mediaType: 'image/jpeg',
343 width: miniature.width, 343 width: miniature.width,
344 height: miniature.height 344 height: miniature.height