Fix privacy concern for remote videos

[github/Chocobozzz/PeerTube.git] / client / src / app / +videos / +video-edit / video-update.component.ts

diff --git a/client/src/app/+videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts
index 30c82343bc4d1285ad931d4346a8711fa5f743f7..9bef60133d7c853a9c3b2d3176bdf30e3d8073f9 100644 (file)
--- a/client/src/app/+videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
@@ -1,10 +1,11 @@
 import { of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
+import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { Component, HostListener, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Notifier } from '@app/core'
-import { FormReactive, FormValidatorService, SelectChannelItem } from '@app/shared/shared-forms'
-import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main'
+import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
+import { Video, VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main'
 import { LiveVideoService } from '@app/shared/shared-video-live'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { LiveVideo, LiveVideoUpdate, VideoPrivacy } from '@shared/models'
@@ -17,6 +18,7 @@ import { hydrateFormFromVideo } from './shared/video-edit-utils'
 })
 export class VideoUpdateComponent extends FormReactive implements OnInit {
   video: VideoEdit
+  videoDetails: VideoDetails
   userVideoChannels: SelectChannelItem[] = []
   videoCaptions: VideoCaptionEdit[] = []
   liveVideo: LiveVideo
@@ -36,7 +38,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     private loadingBar: LoadingBarService,
     private videoCaptionService: VideoCaptionService,
     private liveVideoService: LiveVideoService
-    ) {
+  ) {
     super()
   }
 
@@ -45,37 +47,35 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
     this.route.data
         .pipe(map(data => data.videoData))
-        .subscribe(({ video, videoChannels, videoCaptions, liveVideo }) => {
-          this.video = new VideoEdit(video)
-          this.userVideoChannels = videoChannels
-          this.videoCaptions = videoCaptions
-          this.liveVideo = liveVideo
-
-          this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
+        .subscribe({
+          next: ({ video, videoChannels, videoCaptions, liveVideo }) => {
+            this.video = new VideoEdit(video)
+            this.videoDetails = video
+
+            this.userVideoChannels = videoChannels
+            this.videoCaptions = videoCaptions
+            this.liveVideo = liveVideo
+
+            this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
+
+            // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout
+            setTimeout(() => {
+              hydrateFormFromVideo(this.form, this.video, true)
+
+              if (this.liveVideo) {
+                this.form.patchValue({
+                  saveReplay: this.liveVideo.saveReplay,
+                  permanentLive: this.liveVideo.permanentLive
+                })
+              }
+            })
+          },
 
-          const videoFiles = (video as VideoDetails).getFiles()
-          if (videoFiles.length > 1) { // Already transcoded
-            this.waitTranscodingEnabled = false
+          error: err => {
+            console.error(err)
+            this.notifier.error(err.message)
           }
-
-          // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout
-          setTimeout(() => {
-            hydrateFormFromVideo(this.form, this.video, true)
-
-            if (this.liveVideo) {
-              this.form.patchValue({
-                saveReplay: this.liveVideo.saveReplay,
-                permanentLive: this.liveVideo.permanentLive
-              })
-            }
-          })
-        },
-
-        err => {
-          console.error(err)
-          this.notifier.error(err.message)
-        }
-      )
+        })
   }
 
   @HostListener('window:beforeunload', [ '$event' ])
@@ -106,19 +106,25 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     return this.form.valid
   }
 
+  isWaitTranscodingEnabled () {
+    if (this.videoDetails.getFiles().length > 1) { // Already transcoded
+      return false
+    }
+
+    if (this.liveVideo && this.form.value['saveReplay'] !== true) {
+      return false
+    }
+
+    return true
+  }
+
   update () {
-    if (this.checkForm() === false
-      || this.isUpdatingVideo === true) {
+    if (this.checkForm() === false || this.isUpdatingVideo === true) {
       return
     }
 
     this.video.patch(this.form.value)
 
-    const liveVideoUpdate: LiveVideoUpdate = {
-      saveReplay: this.form.value.saveReplay,
-      permanentLive: this.form.value.permanentLive
-    }
-
     this.loadingBar.useRef().start()
     this.isUpdatingVideo = true
 
@@ -131,25 +137,35 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
           switchMap(() => {
             if (!this.liveVideo) return of(undefined)
 
+            const liveVideoUpdate: LiveVideoUpdate = {
+              saveReplay: !!this.form.value.saveReplay,
+              permanentLive: !!this.form.value.permanentLive
+            }
+
+            // Don't update live attributes if they did not change
+            const liveChanged = Object.keys(liveVideoUpdate)
+              .some(key => this.liveVideo[key] !== liveVideoUpdate[key])
+            if (!liveChanged) return of(undefined)
+
             return this.liveVideoService.updateLive(this.video.id, liveVideoUpdate)
           })
         )
-        .subscribe(
-          () => {
+        .subscribe({
+          next: () => {
             this.updateDone = true
             this.isUpdatingVideo = false
             this.loadingBar.useRef().complete()
             this.notifier.success($localize`Video updated.`)
-            this.router.navigate([ '/videos/watch', this.video.uuid ])
+            this.router.navigateByUrl(Video.buildWatchUrl(this.video))
           },
 
-          err => {
+          error: err => {
             this.loadingBar.useRef().complete()
             this.isUpdatingVideo = false
             this.notifier.error(err.message)
             console.error(err)
           }
-        )
+        })
   }
 
   hydratePluginFieldsFromVideo () {
@@ -159,4 +175,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
       pluginData: this.video.pluginData
     })
   }
+
+  getVideoUrl () {
+    return Video.buildWatchUrl(this.videoDetails)
+  }
 }