Add origin instance URL in watch page

pull/2438/head
Chocobozzz 2020-01-29 13:59:40 +01:00
parent 837666fe48
commit c910f667d2
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 20 additions and 0 deletions

View File

@ -42,6 +42,9 @@ export class Video implements VideoServerModel {
dislikes: number
nsfw: boolean
originInstanceUrl: string
originInstanceHost: string
waitTranscoding?: boolean
state?: VideoConstant<VideoState>
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) {

View File

@ -188,6 +188,11 @@
<span class="video-attribute-value">{{ video.privacy.label }}</span>
</div>
<div *ngIf="video.isLocal === false" class="video-attribute">
<span i18n class="video-attribute-label">Origin instance</span>
<a class="video-attribute-value" target="_blank" rel="noopener noreferrer" [href]="video.originInstanceUrl">{{ video.originInstanceHost }}</a>
</div>
<div *ngIf="!!video.originallyPublishedAt" class="video-attribute">
<span i18n class="video-attribute-label">Originally published</span>
<span class="video-attribute-value">{{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}</span>