From a66424978c681af87aaee92ce6d2ca600d79b82c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 26 Jul 2021 13:37:18 +0200
Subject: Fix URL copy in embed

---
 client/src/assets/player/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index 2bb70d1fa..f26176acc 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -65,7 +65,7 @@ function buildVideoLink (options: {
 
   const url = baseUrl
     ? baseUrl
-    : window.location.origin + window.location.pathname.replace('/embed/', '/w/')
+    : window.location.origin + window.location.pathname.replace('/videos/embed/', '/w/')
 
   const params = generateParams(window.location.search)
 
-- 
cgit v1.2.3


From d91714ca56f7baa2f0eff02f7c1ef2b891096171 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 26 Jul 2021 14:03:21 +0200
Subject: Fix privacy descriptions

---
 .../app/shared/shared-main/video/video.service.ts  | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts
index 49d6fc1c7..04a39be0e 100644
--- a/client/src/app/shared/shared-main/video/video.service.ts
+++ b/client/src/app/shared/shared-main/video/video.service.ts
@@ -379,28 +379,24 @@ export class VideoService implements VideosProvider {
   }
 
   explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) {
-    const descriptions = [
-      {
-        id: VideoPrivacy.PRIVATE,
-        description: $localize`Only I can see this video`
-      },
-      {
-        id: VideoPrivacy.UNLISTED,
-        description: $localize`Only shareable via a private link`
-      },
-      {
-        id: VideoPrivacy.PUBLIC,
-        description: $localize`Anyone can see this video`
-      },
-      {
-        id: VideoPrivacy.INTERNAL,
-        description: $localize`Only users of this instance can see this video`
+    const descriptions = {
+      [VideoPrivacy.PRIVATE]: $localize`Only I can see this video`,
+      [VideoPrivacy.UNLISTED]: $localize`Only shareable via a private link`,
+      [VideoPrivacy.PUBLIC]: $localize`Anyone can see this video`,
+      [VideoPrivacy.INTERNAL]: $localize`Only users of this instance can see this video`
+    }
+
+    const videoPrivacies = serverPrivacies.map(p => {
+      return {
+        ...p,
+
+        description: descriptions[p.id]
       }
-    ]
+    })
 
     return {
-      defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id,
-      videoPrivacies: serverPrivacies.map(p => ({ ...p, description: descriptions.find(p => p.id).description }))
+      videoPrivacies,
+      defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id
     }
   }
 
-- 
cgit v1.2.3


From a00056c0c87b9a3c79a50fc98fa385218cdb3734 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 26 Jul 2021 15:14:17 +0200
Subject: Fix description timestamp click

---
 client/src/app/+videos/+video-watch/video-watch.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0d6103b3b..45cfba167 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -86,7 +86,7 @@
 
       </div>
 
-      <my-video-description [video]="video"></my-video-description>
+      <my-video-description [video]="video" (timestampClicked)="handleTimestampClicked($event)"></my-video-description>
 
       <my-video-attributes [video]="video"></my-video-attributes>
 
-- 
cgit v1.2.3


From 84c6eadc33484358dd962056609df16e8eb1c3d0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 26 Jul 2021 15:17:59 +0200
Subject: Fix moderation embeds

---
 client/src/app/shared/shared-moderation/moderation.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss
index ef822d092..badf9ce4c 100644
--- a/client/src/app/shared/shared-moderation/moderation.scss
+++ b/client/src/app/shared/shared-moderation/moderation.scss
@@ -29,15 +29,6 @@
     height: 100% !important;
     left: 0;
   };
-
-  div {
-    @include miniature-thumbnail;
-
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    color: pvar(--inputPlaceholderColor);
-  }
 }
 
 .chip {
-- 
cgit v1.2.3