From c910f667d29bf2ff1f1c954c6d8b5044cb54a1a6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 29 Jan 2020 13:59:40 +0100 Subject: [PATCH 1/1] Add origin instance URL in watch page --- client/src/app/shared/video/video.model.ts | 15 +++++++++++++++ .../+video-watch/video-watch.component.html | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index 9eeaf41b0..546518cca 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -42,6 +42,9 @@ export class Video implements VideoServerModel { dislikes: number nsfw: boolean + originInstanceUrl: string + originInstanceHost: string + waitTranscoding?: boolean state?: VideoConstant scheduledUpdate?: VideoScheduleUpdate @@ -86,22 +89,31 @@ export class Video implements VideoServerModel { this.waitTranscoding = hash.waitTranscoding this.state = hash.state this.description = hash.description + this.duration = hash.duration this.durationLabel = durationToString(hash.duration) + this.id = hash.id this.uuid = hash.uuid + this.isLocal = hash.isLocal this.name = hash.name + this.thumbnailPath = hash.thumbnailPath this.thumbnailUrl = absoluteAPIUrl + hash.thumbnailPath + this.previewPath = hash.previewPath this.previewUrl = absoluteAPIUrl + hash.previewPath + this.embedPath = hash.embedPath this.embedUrl = absoluteAPIUrl + hash.embedPath + this.views = hash.views this.likes = hash.likes this.dislikes = hash.dislikes + this.nsfw = hash.nsfw + this.account = hash.account this.channel = hash.channel @@ -124,6 +136,9 @@ export class Video implements VideoServerModel { this.blacklistedReason = hash.blacklistedReason this.userHistory = hash.userHistory + + this.originInstanceHost = this.account.host + this.originInstanceUrl = 'https://' + this.originInstanceHost } isVideoNSFWForUser (user: User, serverConfig: ServerConfig) { diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index bc3a3ffdd..a382777f5 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -188,6 +188,11 @@ {{ video.privacy.label }} +
+ Origin instance + {{ video.originInstanceHost }} +
+
Originally published {{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }} -- 2.41.0