Merge branch 'release/3.3.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +videos / +video-edit / video-add-components / video-go-live.component.ts

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 a87d84d4822df82719b405580631c7c3eef1d6fe..db25dc6be44e8c10e08313bd9589e3ddccbe2bf0 100644 (file)
--- 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 { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { Router } from '@angular/router'
-import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@app/core'
+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, VideoPrivacy } from '@shared/models'
 import { VideoSend } from './video-send'
 
 @Component({
@@ -19,7 +19,7 @@ import { VideoSend } from './video-send'
     './video-send.scss'
   ]
 })
-export class VideoGoLiveComponent extends VideoSend implements OnInit, CanComponentDeactivate {
+export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterViewInit, CanComponentDeactivate {
   @Output() firstStepDone = new EventEmitter<string>()
   @Output() firstStepError = new EventEmitter<void>()
 
@@ -30,8 +30,6 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
   videoUUID: string
   error: string
 
-  protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC
-
   constructor (
     protected formValidatorService: FormValidatorService,
     protected loadingBar: LoadingBarService,
@@ -41,7 +39,8 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
     protected videoService: VideoService,
     protected videoCaptionService: VideoCaptionService,
     private liveVideoService: LiveVideoService,
-    private router: Router
+    private router: Router,
+    private hooks: HooksService
     ) {
     super()
   }
@@ -50,14 +49,20 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
     super.ngOnInit()
   }
 
+  ngAfterViewInit () {
+    this.hooks.runAction('action:go-live.init', 'video-edit')
+  }
+
   canDeactivate () {
     return { canDeactivate: true }
   }
 
   goLive () {
+    const name = 'Live'
+
     const video: LiveVideoCreate = {
-      name: 'Live',
-      privacy: VideoPrivacy.PRIVATE,
+      name,
+      privacy: this.highestPrivacy,
       nsfw: this.serverConfig.instance.isNSFW,
       waitTranscoding: true,
       commentsEnabled: true,
@@ -85,9 +90,11 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
 
         let message = err.message
 
-        if (err.body?.code === ServerErrorCode.MAX_INSTANCE_LIVES_LIMIT_REACHED) {
+        const error = err.body as PeerTubeProblemDocument
+
+        if (error?.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) {
+        } else if (error?.code === ServerErrorCode.MAX_USER_LIVES_LIMIT_REACHED) {
           message = $localize`Cannot create live because you created too many lives`
         }
 
@@ -120,7 +127,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
       () => {
         this.notifier.success($localize`Live published.`)
 
-        this.router.navigate(['/videos/watch', video.uuid])
+        this.router.navigateByUrl(Video.buildWatchUrl(video))
       },
 
       err => {
@@ -135,6 +142,10 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon
     return this.serverConfig.live.maxDuration / 1000
   }
 
+  isWaitTranscodingEnabled () {
+    return this.form.value['saveReplay'] === true
+  }
+
   private fetchVideoLive () {
     this.liveVideoService.getVideoLive(this.videoId)
       .subscribe(