OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/2.1.0' into develop

pull/2438/head
Chocobozzz 2020-01-29 14:42:02 +01:00
parent cf59a2a0c3 9c9a166783
commit d5692d4088
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/models/video/thumbnail.ts
View File

@ -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

2
server/models/video/video-format-utils.ts
View File

@ -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