X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fvideo-add-components%2Fvideo-go-live.component.ts;h=ee7011b4c1a5d5bb3bb7f24692de41ba746424a3;hb=3eb7ee658db32d270553046eeb77afc679a71466;hp=8e035b6bbba9c1141b4a57c7f6b8fbe2631a0540;hpb=a786d8a08bf99f339bf16808f46e160404497ae2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
index 8e035b6bb..ee7011b4c 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
@@ -1,14 +1,14 @@
 
 import { forkJoin } from 'rxjs'
-import { AfterViewChecked, AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { Router } from '@angular/router'
 import { AuthService, CanComponentDeactivate, HooksService, Notifier, ServerService } from '@app/core'
 import { scrollToTop } from '@app/helpers'
 import { FormValidatorService } from '@app/shared/shared-forms'
-import { VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
+import { Video, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
 import { LiveVideoService } from '@app/shared/shared-video-live'
 import { LoadingBarService } from '@ngx-loading-bar/core'
-import { LiveVideo, LiveVideoCreate, LiveVideoUpdate, ServerErrorCode, VideoPrivacy } from '@shared/models'
+import { LiveVideo, LiveVideoCreate, LiveVideoUpdate, PeerTubeProblemDocument, ServerErrorCode } from '@shared/models'
 import { VideoSend } from './video-send'
 
 @Component({
@@ -26,11 +26,12 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
   isInUpdateForm = false
 
   liveVideo: LiveVideo
+
   videoId: number
   videoUUID: string
-  error: string
+  videoShortUUID: string
 
-  protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC
+  error: string
 
   constructor (
     protected formValidatorService: FormValidatorService,
@@ -43,7 +44,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
     private liveVideoService: LiveVideoService,
     private router: Router,
     private hooks: HooksService
-    ) {
+  ) {
     super()
   }
 
@@ -64,11 +65,13 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
 
     const video: LiveVideoCreate = {
       name,
-      privacy: VideoPrivacy.PRIVATE,
+      privacy: this.highestPrivacy,
       nsfw: this.serverConfig.instance.isNSFW,
       waitTranscoding: true,
       commentsEnabled: true,
       downloadEnabled: true,
+      permanentLive: false,
+      saveReplay: false,
       channelId: this.firstStepChannelId
     }
 
@@ -76,31 +79,35 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
     const toPatch = Object.assign({}, video, { privacy: this.firstStepPrivacyId })
     this.form.patchValue(toPatch)
 
-    this.liveVideoService.goLive(video).subscribe(
-      res => {
-        this.videoId = res.video.id
-        this.videoUUID = res.video.uuid
-        this.isInUpdateForm = true
+    this.liveVideoService.goLive(video)
+      .subscribe({
+        next: res => {
+          this.videoId = res.video.id
+          this.videoUUID = res.video.uuid
+          this.videoShortUUID = res.video.shortUUID
+          this.isInUpdateForm = true
 
-        this.firstStepDone.emit(name)
+          this.firstStepDone.emit(name)
 
-        this.fetchVideoLive()
-      },
+          this.fetchVideoLive()
+        },
 
-      err => {
-        this.firstStepError.emit()
+        error: err => {
+          this.firstStepError.emit()
 
-        let message = err.message
+          let message = err.message
 
-        if (err.body?.code === ServerErrorCode.MAX_INSTANCE_LIVES_LIMIT_REACHED) {
-          message = $localize`Cannot create live because this instance have too many created lives`
-        } else if (err.body?.code) {
-          message = $localize`Cannot create live because you created too many lives`
-        }
+          const error = err.body as PeerTubeProblemDocument
 
-        this.notifier.error(message)
-      }
-    )
+          if (error?.code === ServerErrorCode.MAX_INSTANCE_LIVES_LIMIT_REACHED) {
+            message = $localize`Cannot create live because this instance have too many created lives`
+          } else if (error?.code === ServerErrorCode.MAX_USER_LIVES_LIMIT_REACHED) {
+            message = $localize`Cannot create live because you created too many lives`
+          }
+
+          this.notifier.error(message)
+        }
+      })
   }
 
   updateSecondStep () {
@@ -112,6 +119,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
     video.patch(this.form.value)
     video.id = this.videoId
     video.uuid = this.videoUUID
+    video.shortUUID = this.videoShortUUID
 
     const liveVideoUpdate: LiveVideoUpdate = {
       saveReplay: this.form.value.saveReplay,
@@ -123,19 +131,19 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
       this.updateVideoAndCaptions(video),
 
       this.liveVideoService.updateLive(this.videoId, liveVideoUpdate)
-    ]).subscribe(
-      () => {
+    ]).subscribe({
+      next: () => {
         this.notifier.success($localize`Live published.`)
 
-        this.router.navigate(['/videos/watch', video.uuid])
+        this.router.navigateByUrl(Video.buildWatchUrl(video))
       },
 
-      err => {
+      error: err => {
         this.error = err.message
         scrollToTop()
         console.error(err)
       }
-    )
+    })
   }
 
   getMaxLiveDuration () {
@@ -148,15 +156,15 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
 
   private fetchVideoLive () {
     this.liveVideoService.getVideoLive(this.videoId)
-      .subscribe(
-        liveVideo => {
+      .subscribe({
+        next: liveVideo => {
           this.liveVideo = liveVideo
         },
 
-        err => {
+        error: err => {
           this.firstStepError.emit()
           this.notifier.error(err.message)
         }
-      )
+      })
   }
 }