Merge branch 'release/3.3.0' into develop

3 files changed, 16 insertions, 29 deletions

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>
 
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
     }
   }
 
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 {