From ab4001aade0891b70e456a215ced0f825c57fde8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 22 Oct 2021 14:11:58 +0200 Subject: Provide origin URL to client and fix remote share --- client/src/app/shared/shared-main/video/video.model.ts | 2 +- client/src/app/shared/shared-share-modal/video-share.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts index 7471a933b..10caec014 100644 --- a/client/src/app/shared/shared-main/video/video.model.ts +++ b/client/src/app/shared/shared-main/video/video.model.ts @@ -52,7 +52,7 @@ export class Video implements VideoServerModel { embedPath: string embedUrl: string - url?: string + url: string views: number likes: number diff --git a/client/src/app/shared/shared-share-modal/video-share.component.ts b/client/src/app/shared/shared-share-modal/video-share.component.ts index 341abdc2b..70890e551 100644 --- a/client/src/app/shared/shared-share-modal/video-share.component.ts +++ b/client/src/app/shared/shared-share-modal/video-share.component.ts @@ -96,12 +96,12 @@ export class VideoShareComponent { } getVideoUrl () { - const baseUrl = this.customizations.originUrl - ? this.video.originInstanceUrl - : window.location.origin + const url = this.customizations.originUrl + ? this.video.url + : buildVideoLink(this.video, window.location.origin) return decorateVideoLink({ - url: buildVideoLink(this.video, baseUrl), + url, ...this.getVideoOptions() }) -- cgit v1.2.3