X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.ts;h=8d9c08ab36edf9659f617443b64bb1bdd5656850;hb=9ca0f688e9e8558233f1a538b96a43da44e35353;hp=7af37ef03ad815a915942980b47dba08ed408b03;hpb=2453589a286e1f65843af582512387b2fa17b502;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 7af37ef03..8d9c08ab3 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -1,8 +1,8 @@
 import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { forkJoin, Subscription } from 'rxjs'
-import { catchError } from 'rxjs/operators'
+import { forkJoin, map, Observable, of, Subscription, switchMap } from 'rxjs'
+import { VideoJsPlayer } from 'video.js'
 import { PlatformLocation } from '@angular/common'
-import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import {
   AuthService,
@@ -15,17 +15,28 @@ import {
   RestExtractor,
   ScreenService,
   ServerService,
+  User,
   UserService
 } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
 import { isXPercentInViewport, scrollToTop } from '@app/helpers'
 import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
 import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
-import { VideoActionsDisplayType } from '@app/shared/shared-video-miniature'
+import { LiveVideoService } from '@app/shared/shared-video-live'
 import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { HTMLServerConfig, PeerTubeProblemDocument, ServerErrorCode, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
-import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
+import { logger } from '@root-helpers/logger'
+import { isP2PEnabled } from '@root-helpers/video'
+import { timeToInt } from '@shared/core-utils'
+import {
+  HTMLServerConfig,
+  HttpStatusCode,
+  LiveVideo,
+  PeerTubeProblemDocument,
+  ServerErrorCode,
+  VideoCaption,
+  VideoPrivacy,
+  VideoState
+} from '@shared/models'
 import {
   CustomizationOptions,
   P2PMediaLoaderOptions,
@@ -33,8 +44,8 @@ import {
   PeertubePlayerManagerOptions,
   PlayerMode,
   videojs
-} from '../../../assets/player/peertube-player-manager'
-import { timeToInt } from '../../../assets/player/utils'
+} from '../../../assets/player'
+import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
 import { environment } from '../../../environments/environment'
 import { VideoWatchPlaylistComponent } from './shared'
 
@@ -49,41 +60,26 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   @ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
   @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
 
-  player: any
+  player: VideoJsPlayer
   playerElement: HTMLVideoElement
-
-  theaterEnabled = false
-
   playerPlaceholderImgSrc: string
+  theaterEnabled = false
 
   video: VideoDetails = null
   videoCaptions: VideoCaption[] = []
+  liveVideo: LiveVideo
 
   playlistPosition: number
   playlist: VideoPlaylist = null
 
-  likesBarTooltipText = ''
-
   remoteServerDown = false
+  noPlaylistVideoFound = false
 
-  tooltipSupport = ''
-  tooltipSaveToPlaylist = ''
-
-  videoActionsOptions: VideoActionsDisplayType = {
-    playlist: false,
-    download: true,
-    update: true,
-    blacklist: true,
-    delete: true,
-    report: true,
-    duplicate: true,
-    mute: true,
-    liveInfo: true
-  }
-
-  private nextVideoUuid = ''
+  private nextVideoUUID = ''
   private nextVideoTitle = ''
+
   private currentTime: number
+
   private paramsSub: Subscription
   private queryParamsSub: Subscription
   private configSub: Subscription
@@ -95,11 +91,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
   constructor (
     private elementRef: ElementRef,
-    private changeDetector: ChangeDetectorRef,
     private route: ActivatedRoute,
     private router: Router,
     private videoService: VideoService,
     private playlistService: VideoPlaylistService,
+    private liveVideoService: LiveVideoService,
     private confirmService: ConfirmService,
     private metaService: MetaService,
     private authService: AuthService,
@@ -126,43 +122,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.userService.getAnonymousUser()
   }
 
-  async ngOnInit () {
+  ngOnInit () {
     this.serverConfig = this.serverService.getHTMLConfig()
 
-    // Hide the tooltips for unlogged users in mobile view, this adds confusion with the popover
-    if (this.user || !this.screenService.isInMobileView()) {
-      this.tooltipSupport = $localize`Support options for this video`
-      this.tooltipSaveToPlaylist = $localize`Save to playlist`
-    }
-
     PeertubePlayerManager.initState()
 
-    this.paramsSub = this.route.params.subscribe(routeParams => {
-      const videoId = routeParams[ 'videoId' ]
-      if (videoId) this.loadVideo(videoId)
-
-      const playlistId = routeParams[ 'playlistId' ]
-      if (playlistId) this.loadPlaylist(playlistId)
-    })
-
-    this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
-      // Handle the ?playlistPosition
-      const positionParam = queryParams[ 'playlistPosition' ] ?? 1
-
-      this.playlistPosition = positionParam === 'last'
-        ? -1 // Handle the "last" index
-        : parseInt(positionParam + '', 10)
-
-      if (isNaN(this.playlistPosition)) {
-        console.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`)
-        this.playlistPosition = 1
-      }
-
-      this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
-
-      const start = queryParams[ 'start' ]
-      if (this.player && start) this.player.currentTime(parseInt(start, 10))
-    })
+    this.loadRouteParams()
+    this.loadRouteQuery()
 
     this.initHotkeys()
 
@@ -194,55 +160,36 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.videoWatchPlaylist.currentPlaylistPosition
   }
 
-  isUserLoggedIn () {
-    return this.authService.isLoggedIn()
-  }
+  onRecommendations (videos: Video[]) {
+    if (videos.length === 0) return
 
-  getVideoUrl () {
-    if (!this.video.url) {
-      return this.video.originInstanceUrl + VideoDetails.buildWatchUrl(this.video)
-    }
-    return this.video.url
+    // The recommended videos's first element should be the next video
+    const video = videos[0]
+    this.nextVideoUUID = video.uuid
+    this.nextVideoTitle = video.name
   }
 
-  getVideoTags () {
-    if (!this.video || Array.isArray(this.video.tags) === false) return []
+  handleTimestampClicked (timestamp: number) {
+    if (!this.player || this.video.isLive) return
 
-    return this.video.tags
+    this.player.currentTime(timestamp)
+    scrollToTop()
   }
 
-  onRecommendations (videos: Video[]) {
-    if (videos.length > 0) {
-      // The recommended videos's first element should be the next video
-      const video = videos[0]
-      this.nextVideoUuid = video.uuid
-      this.nextVideoTitle = video.name
-    }
+  onPlaylistVideoFound (videoId: string) {
+    this.loadVideo(videoId)
   }
 
-  isVideoBlur (video: Video) {
-    return video.isVideoNSFWForUser(this.user, this.serverConfig)
+  onPlaylistNoVideoFound () {
+    this.noPlaylistVideoFound = true
   }
 
-  isAutoPlayEnabled () {
-    return (
-      (this.user && this.user.autoPlayNextVideo) ||
-      this.anonymousUser.autoPlayNextVideo
-    )
-  }
-
-  handleTimestampClicked (timestamp: number) {
-    if (!this.player || this.video.isLive) return
-
-    this.player.currentTime(timestamp)
-    scrollToTop()
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
   }
 
-  isPlaylistAutoPlayEnabled () {
-    return (
-      (this.user && this.user.autoPlayNextVideoPlaylist) ||
-      this.anonymousUser.autoPlayNextVideoPlaylist
-    )
+  isVideoBlur (video: Video) {
+    return video.isVideoNSFWForUser(this.user, this.serverConfig)
   }
 
   isChannelDisplayNameGeneric () {
@@ -254,24 +201,49 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return genericChannelDisplayName.includes(this.video.channel.displayName)
   }
 
-  onPlaylistVideoFound (videoId: string) {
-    this.loadVideo(videoId)
-  }
-
   displayOtherVideosAsRow () {
     // Use the same value as in the SASS file
     return this.screenService.getWindowInnerWidth() <= 1100
   }
 
+  private loadRouteParams () {
+    this.paramsSub = this.route.params.subscribe(routeParams => {
+      const videoId = routeParams['videoId']
+      if (videoId) return this.loadVideo(videoId)
+
+      const playlistId = routeParams['playlistId']
+      if (playlistId) return this.loadPlaylist(playlistId)
+    })
+  }
+
+  private loadRouteQuery () {
+    this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
+      // Handle the ?playlistPosition
+      const positionParam = queryParams['playlistPosition'] ?? 1
+
+      this.playlistPosition = positionParam === 'last'
+        ? -1 // Handle the "last" index
+        : parseInt(positionParam + '', 10)
+
+      if (isNaN(this.playlistPosition)) {
+        logger.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`)
+        this.playlistPosition = 1
+      }
+
+      this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
+
+      const start = queryParams['start']
+      if (this.player && start) this.player.currentTime(parseInt(start, 10))
+    })
+  }
+
   private loadVideo (videoId: string) {
-    // Video did not change
-    if (
-      this.video &&
-      (this.video.uuid === videoId || this.video.shortUUID === videoId)
-    ) return
+    if (this.isSameElement(this.video, videoId)) return
 
     if (this.player) this.player.pause()
 
+    this.video = undefined
+
     const videoObs = this.hooks.wrapObsFun(
       this.videoService.getVideo.bind(this.videoService),
       { videoId },
@@ -280,45 +252,21 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       'filter:api.video-watch.video.get.result'
     )
 
-    // Video did change
-    forkJoin([
-      videoObs,
-      this.videoCaptionService.listCaptions(videoId)
-    ])
-      .pipe(
-        // If 400, 403 or 404, the video is private or blocked so redirect to 404
-        catchError(err => {
-          const errorBody = err.body as PeerTubeProblemDocument
-
-          if (errorBody.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) {
-            const search = window.location.search
-            let originUrl = errorBody.originUrl
-            if (search) originUrl += search
-
-            this.confirmService.confirm(
-              $localize`This video is not available on this instance. Do you want to be redirected on the origin instance: <a href="${originUrl}">${originUrl}</a>?`,
-              $localize`Redirection`
-            ).then(res => {
-              if (res === false) {
-                return this.restExtractor.redirectTo404IfNotFound(err, 'video', [
-                  HttpStatusCode.BAD_REQUEST_400,
-                  HttpStatusCode.FORBIDDEN_403,
-                  HttpStatusCode.NOT_FOUND_404
-                ])
-              }
-
-              return window.location.href = originUrl
-            })
-          }
+    const videoAndLiveObs: Observable<{ video: VideoDetails, live?: LiveVideo }> = videoObs.pipe(
+      switchMap(video => {
+        if (!video.isLive) return of({ video })
 
-          return this.restExtractor.redirectTo404IfNotFound(err, 'video', [
-            HttpStatusCode.BAD_REQUEST_400,
-            HttpStatusCode.FORBIDDEN_403,
-            HttpStatusCode.NOT_FOUND_404
-          ])
-        })
-      )
-      .subscribe(([ video, captionsResult ]) => {
+        return this.liveVideoService.getVideoLive(video.uuid)
+          .pipe(map(live => ({ live, video })))
+      })
+    )
+
+    forkJoin([
+      videoAndLiveObs,
+      this.videoCaptionService.listCaptions(videoId),
+      this.userService.getAnonymousOrLoggedUser()
+    ]).subscribe({
+      next: ([ { video, live }, captionsResult, loggedInOrAnonymousUser ]) => {
         const queryParams = this.route.snapshot.queryParams
 
         const urlOptions = {
@@ -335,43 +283,68 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
           peertubeLink: false
         }
 
-        this.onVideoFetched(video, captionsResult.data, urlOptions)
-            .catch(err => this.handleError(err))
-      })
+        this.onVideoFetched({ video, live, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions })
+            .catch(err => this.handleGlobalError(err))
+      },
+
+      error: err => this.handleRequestError(err)
+    })
   }
 
   private loadPlaylist (playlistId: string) {
-    // Playlist did not change
-    if (
-      this.playlist &&
-      (this.playlist.uuid === playlistId || this.playlist.shortUUID === playlistId)
-    ) return
+    if (this.isSameElement(this.playlist, playlistId)) return
+
+    this.noPlaylistVideoFound = false
 
     this.playlistService.getVideoPlaylist(playlistId)
-      .pipe(
-        // If 400 or 403, the video is private or blocked so redirect to 404
-        catchError(err => this.restExtractor.redirectTo404IfNotFound(err, 'video', [
-          HttpStatusCode.BAD_REQUEST_400,
-          HttpStatusCode.FORBIDDEN_403,
-          HttpStatusCode.NOT_FOUND_404
-        ]))
-      )
-      .subscribe(playlist => {
-        this.playlist = playlist
+      .subscribe({
+        next: playlist => {
+          this.playlist = playlist
 
-        this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition)
+          this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition)
+        },
+
+        error: err => this.handleRequestError(err)
       })
   }
 
-  private handleError (err: any) {
+  private isSameElement (element: VideoDetails | VideoPlaylist, newId: string) {
+    if (!element) return false
+
+    return (element.id + '') === newId || element.uuid === newId || element.shortUUID === newId
+  }
+
+  private async handleRequestError (err: any) {
+    const errorBody = err.body as PeerTubeProblemDocument
+
+    if (errorBody?.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) {
+      const originUrl = errorBody.originUrl + (window.location.search ?? '')
+
+      const res = await this.confirmService.confirm(
+        // eslint-disable-next-line max-len
+        $localize`This video is not available on this instance. Do you want to be redirected on the origin instance: <a href="${originUrl}">${originUrl}</a>?`,
+        $localize`Redirection`
+      )
+
+      if (res === true) return window.location.href = originUrl
+    }
+
+    // If 400, 403 or 404, the video is private or blocked so redirect to 404
+    return this.restExtractor.redirectTo404IfNotFound(err, 'video', [
+      HttpStatusCode.BAD_REQUEST_400,
+      HttpStatusCode.FORBIDDEN_403,
+      HttpStatusCode.NOT_FOUND_404
+    ])
+  }
+
+  private handleGlobalError (err: any) {
     const errorMessage: string = typeof err === 'string' ? err : err.message
     if (!errorMessage) return
 
     // Display a message in the video player instead of a notification
-    if (errorMessage.indexOf('from xs param') !== -1) {
+    if (errorMessage.includes('from xs param')) {
       this.flushPlayer()
       this.remoteServerDown = true
-      this.changeDetector.detectChanges()
 
       return
     }
@@ -379,15 +352,20 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.notifier.error(errorMessage)
   }
 
-  private async onVideoFetched (
-    video: VideoDetails,
-    videoCaptions: VideoCaption[],
+  private async onVideoFetched (options: {
+    video: VideoDetails
+    live: LiveVideo
+    videoCaptions: VideoCaption[]
     urlOptions: URLOptions
-  ) {
+    loggedInOrAnonymousUser: User
+  }) {
+    const { video, live, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options
+
     this.subscribeToLiveEventsIfNeeded(this.video, video)
 
     this.video = video
     this.videoCaptions = videoCaptions
+    this.liveVideo = live
 
     // Re init attributes
     this.playerPlaceholderImgSrc = undefined
@@ -402,8 +380,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       if (res === false) return this.location.back()
     }
 
-    this.buildPlayer(urlOptions)
-      .catch(err => console.error('Cannot build the player', err))
+    this.buildPlayer(urlOptions, loggedInOrAnonymousUser)
+      .catch(err => logger.error('Cannot build the player', err))
 
     this.setOpenGraphTags()
 
@@ -415,7 +393,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', hookOptions)
   }
 
-  private async buildPlayer (urlOptions: URLOptions) {
+  private async buildPlayer (urlOptions: URLOptions, loggedInOrAnonymousUser: User) {
     // Flush old player if needed
     this.flushPlayer()
 
@@ -435,7 +413,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     const params = {
       video: this.video,
       videoCaptions: this.videoCaptions,
+      liveVideo: this.liveVideo,
       urlOptions,
+      loggedInOrAnonymousUser,
       user: this.user
     }
     const { playerMode, playerOptions } = await this.hooks.wrapFun(
@@ -449,50 +429,55 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.zone.runOutsideAngular(async () => {
       this.player = await PeertubePlayerManager.initialize(playerMode, playerOptions, player => this.player = player)
 
-      this.player.on('customError', ({ err }: { err: any }) => this.handleError(err))
+      this.player.on('customError', (_e, data: any) => {
+        this.zone.run(() => this.handleGlobalError(data.err))
+      })
 
       this.player.on('timeupdate', () => {
+        // Don't need to trigger angular change for this variable, that is sent to children components on click
         this.currentTime = Math.floor(this.player.currentTime())
       })
 
       /**
-       * replaces this.player.one('ended')
-       * 'condition()': true to make the upnext functionality trigger,
-       *                false to disable the upnext functionality
-       * go to the next video in 'condition()' if you don't want of the timer.
-       * 'next': function triggered at the end of the timer.
-       * 'suspended': function used at each clic of the timer checking if we need
-       * to reset progress and wait until 'suspended' becomes truthy again.
+       * condition: true to make the upnext functionality trigger, false to disable the upnext functionality
+       *            go to the next video in 'condition()' if you don't want of the timer.
+       * next: function triggered at the end of the timer.
+       * suspended: function used at each click of the timer checking if we need to reset progress
+       *            and wait until suspended becomes truthy again.
        */
       this.player.upnext({
-        timeout: 10000, // 10s
+        timeout: 5000, // 5s
+
         headText: $localize`Up Next`,
         cancelText: $localize`Cancel`,
         suspendedText: $localize`Autoplay is suspended`,
+
         getTitle: () => this.nextVideoTitle,
-        next: () => this.zone.run(() => this.autoplayNext()),
+
+        next: () => this.zone.run(() => this.playNextVideoInAngularZone()),
         condition: () => {
-          if (this.playlist) {
-            if (this.isPlaylistAutoPlayEnabled()) {
-              // upnext will not trigger, and instead the next video will play immediately
-              this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
-            }
-          } else if (this.isAutoPlayEnabled()) {
-            return true // upnext will trigger
+          if (!this.playlist) return this.isAutoPlayNext()
+
+          // Don't wait timeout to play the next playlist video
+          if (this.isPlaylistAutoPlayNext()) {
+            this.playNextVideoInAngularZone()
+            return undefined
           }
-          return false // upnext will not trigger, and instead leave the video stopping
+
+          return false
         },
+
         suspended: () => {
           return (
-            !isXPercentInViewport(this.player.el(), 80) ||
+            !isXPercentInViewport(this.player.el() as HTMLElement, 80) ||
             !document.getElementById('content').contains(document.activeElement)
           )
         }
       })
 
       this.player.one('stopped', () => {
-        if (this.playlist) {
-          if (this.isPlaylistAutoPlayEnabled()) this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
+        if (this.playlist && this.isPlaylistAutoPlayNext()) {
+          this.playNextVideoInAngularZone()
         }
       })
 
@@ -506,37 +491,33 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         this.zone.run(() => this.theaterEnabled = enabled)
       })
 
-      this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player, videojs, video: this.video })
+      this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', {
+        player: this.player,
+        playlist: this.playlist,
+        playlistPosition: this.playlistPosition,
+        videojs,
+        video: this.video
+      })
     })
   }
 
-  private autoplayNext () {
+  private hasNextVideo () {
     if (this.playlist) {
-      this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
-    } else if (this.nextVideoUuid) {
-      this.router.navigate([ '/w', this.nextVideoUuid ])
+      return this.videoWatchPlaylist.hasNextVideo()
     }
-  }
-
-  private setOpenGraphTags () {
-    this.metaService.setTitle(this.video.name)
 
-    this.metaService.setTag('og:type', 'video')
-
-    this.metaService.setTag('og:title', this.video.name)
-    this.metaService.setTag('name', this.video.name)
-
-    this.metaService.setTag('og:description', this.video.description)
-    this.metaService.setTag('description', this.video.description)
-
-    this.metaService.setTag('og:image', this.video.previewPath)
-
-    this.metaService.setTag('og:duration', this.video.duration.toString())
+    return true
+  }
 
-    this.metaService.setTag('og:site_name', 'PeerTube')
+  private playNextVideoInAngularZone () {
+    if (this.playlist) {
+      this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
+      return
+    }
 
-    this.metaService.setTag('og:url', window.location.href)
-    this.metaService.setTag('url', window.location.href)
+    if (this.nextVideoUUID) {
+      this.router.navigate([ '/w', this.nextVideoUUID ])
+    }
   }
 
   private isAutoplay () {
@@ -550,6 +531,20 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.user.autoPlayVideo !== false
   }
 
+  private isAutoPlayNext () {
+    return (
+      (this.user?.autoPlayNextVideo) ||
+      this.anonymousUser.autoPlayNextVideo
+    )
+  }
+
+  private isPlaylistAutoPlayNext () {
+    return (
+      (this.user?.autoPlayNextVideoPlaylist) ||
+      this.anonymousUser.autoPlayNextVideoPlaylist
+    )
+  }
+
   private flushPlayer () {
     // Remove player if it exists
     if (!this.player) return
@@ -558,17 +553,20 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       this.player.dispose()
       this.player = undefined
     } catch (err) {
-      console.error('Cannot dispose player.', err)
+      logger.error('Cannot dispose player.', err)
     }
   }
 
   private buildPlayerManagerOptions (params: {
-    video: VideoDetails,
-    videoCaptions: VideoCaption[],
-    urlOptions: CustomizationOptions & { playerMode: PlayerMode },
-    user?: AuthUser
+    video: VideoDetails
+    liveVideo: LiveVideo
+    videoCaptions: VideoCaption[]
+    urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+    loggedInOrAnonymousUser: User
+    user?: AuthUser // Keep for plugins
   }) {
-    const { video, videoCaptions, urlOptions, user } = params
+    const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser } = params
+
     const getStartTime = () => {
       const byUrl = urlOptions.startTime !== undefined
       const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined)
@@ -592,10 +590,17 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       src: environment.apiUrl + c.captionPath
     }))
 
+    const liveOptions = video.isLive
+      ? { latencyMode: liveVideo.latencyMode }
+      : undefined
+
     const options: PeertubePlayerManagerOptions = {
       common: {
         autoplay: this.isAutoplay(),
-        nextVideo: () => this.zone.run(() => this.autoplayNext()),
+        p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled),
+
+        hasNextVideo: () => this.hasNextVideo(),
+        nextVideo: () => this.playNextVideoInAngularZone(),
 
         playerElement: this.playerElement,
         onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,
@@ -607,6 +612,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
         startTime,
         stopTime: urlOptions.stopTime,
+        controlBar: urlOptions.controlBar,
         controls: urlOptions.controls,
         muted: urlOptions.muted,
         loop: urlOptions.loop,
@@ -620,23 +626,25 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE
           ? this.videoService.getVideoViewUrl(video.uuid)
           : null,
+        authorizationHeader: this.authService.getRequestHeaderValue(),
+
         embedUrl: video.embedUrl,
         embedTitle: video.name,
+        instanceName: this.serverConfig.instance.name,
 
         isLive: video.isLive,
+        liveOptions,
 
         language: this.localeId,
 
-        userWatching: user && user.videosHistoryEnabled === true ? {
-          url: this.videoService.getUserWatchingVideoUrl(video.uuid),
-          authorizationHeader: this.authService.getRequestHeaderValue()
-        } : undefined,
-
         serverUrl: environment.apiUrl,
 
         videoCaptions: playerCaptions,
 
-        videoUUID: video.uuid
+        videoShortUUID: video.shortUUID,
+        videoUUID: video.uuid,
+
+        errorNotifier: (message: string) => this.notifier.error(message)
       },
 
       webtorrent: {
@@ -648,6 +656,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     // Only set this if we're in a playlist
     if (this.playlist) {
+      options.common.hasPreviousVideo = () => this.videoWatchPlaylist.hasPreviousVideo()
+
       options.common.previousVideo = () => {
         this.zone.run(() => this.videoWatchPlaylist.navigateToPreviousPlaylistVideo())
       }
@@ -663,7 +673,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       else mode = 'webtorrent'
     }
 
-    // p2p-media-loader needs TextEncoder, try to fallback on WebTorrent
+    // p2p-media-loader needs TextEncoder, fallback on WebTorrent if not available
     if (typeof TextEncoder === 'undefined') {
       mode = 'webtorrent'
     }
@@ -691,7 +701,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     }
 
     if (oldVideo && oldVideo.id !== newVideo.id) {
-      await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+      this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
     }
 
     if (!newVideo.isLive) return
@@ -703,61 +713,66 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.peertubeSocket.getLiveVideosObservable()
       .subscribe(({ type, payload }) => {
         if (type === 'state-change') return this.handleLiveStateChange(payload.state)
-        if (type === 'views-change') return this.handleLiveViewsChange(payload.views)
+        if (type === 'views-change') return this.handleLiveViewsChange(payload.viewers)
       })
   }
 
   private handleLiveStateChange (newState: VideoState) {
     if (newState !== VideoState.PUBLISHED) return
 
-    const videoState = this.video.state.id
-    if (videoState !== VideoState.WAITING_FOR_LIVE && videoState !== VideoState.LIVE_ENDED) return
-
-    console.log('Loading video after live update.')
+    logger.info('Loading video after live update.')
 
     const videoUUID = this.video.uuid
 
-    // Reset to refetch the video
+    // Reset to force refresh the video
     this.video = undefined
     this.loadVideo(videoUUID)
   }
 
-  private handleLiveViewsChange (newViews: number) {
+  private handleLiveViewsChange (newViewers: number) {
     if (!this.video) {
-      console.error('Cannot update video live views because video is no defined.')
+      logger.error('Cannot update video live views because video is no defined.')
       return
     }
 
-    console.log('Updating live views.')
+    logger.info('Updating live views.')
 
-    this.video.views = newViews
+    this.video.viewers = newViewers
   }
 
   private initHotkeys () {
     this.hotkeys = [
       // These hotkeys are managed by the player
-      new Hotkey('f', e => e, undefined, $localize`Enter/exit fullscreen (requires player focus)`),
-      new Hotkey('space', e => e, undefined, $localize`Play/Pause the video (requires player focus)`),
-      new Hotkey('m', e => e, undefined, $localize`Mute/unmute the video (requires player focus)`),
+      new Hotkey('f', e => e, undefined, $localize`Enter/exit fullscreen`),
+      new Hotkey('space', e => e, undefined, $localize`Play/Pause the video`),
+      new Hotkey('m', e => e, undefined, $localize`Mute/unmute the video`),
 
-      new Hotkey('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90% (requires player focus)`),
+      new Hotkey('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90%`),
 
-      new Hotkey('up', e => e, undefined, $localize`Increase the volume (requires player focus)`),
-      new Hotkey('down', e => e, undefined, $localize`Decrease the volume (requires player focus)`),
+      new Hotkey('up', e => e, undefined, $localize`Increase the volume`),
+      new Hotkey('down', e => e, undefined, $localize`Decrease the volume`),
 
-      new Hotkey('right', e => e, undefined, $localize`Seek the video forward (requires player focus)`),
-      new Hotkey('left', e => e, undefined, $localize`Seek the video backward (requires player focus)`),
+      new Hotkey('right', e => e, undefined, $localize`Seek the video forward`),
+      new Hotkey('left', e => e, undefined, $localize`Seek the video backward`),
 
-      new Hotkey('>', e => e, undefined, $localize`Increase playback rate (requires player focus)`),
-      new Hotkey('<', e => e, undefined, $localize`Decrease playback rate (requires player focus)`),
+      new Hotkey('>', e => e, undefined, $localize`Increase playback rate`),
+      new Hotkey('<', e => e, undefined, $localize`Decrease playback rate`),
 
-      new Hotkey('.', e => e, undefined, $localize`Navigate in the video frame by frame (requires player focus)`)
+      new Hotkey(',', e => e, undefined, $localize`Navigate in the video to the previous frame`),
+      new Hotkey('.', e => e, undefined, $localize`Navigate in the video to the next frame`),
+
+      new Hotkey('t', e => {
+        this.theaterEnabled = !this.theaterEnabled
+        return false
+      }, undefined, $localize`Toggle theater mode`)
     ]
 
     if (this.isUserLoggedIn()) {
       this.hotkeys = this.hotkeys.concat([
         new Hotkey('shift+s', () => {
-          this.subscribeButton.subscribed ? this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe()
+          if (this.subscribeButton.isSubscribedToAll()) this.subscribeButton.unsubscribe()
+          else this.subscribeButton.subscribe()
+
           return false
         }, undefined, $localize`Subscribe to the account`)
       ])
@@ -765,4 +780,25 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     this.hotkeysService.add(this.hotkeys)
   }
+
+  private setOpenGraphTags () {
+    this.metaService.setTitle(this.video.name)
+
+    this.metaService.setTag('og:type', 'video')
+
+    this.metaService.setTag('og:title', this.video.name)
+    this.metaService.setTag('name', this.video.name)
+
+    this.metaService.setTag('og:description', this.video.description)
+    this.metaService.setTag('description', this.video.description)
+
+    this.metaService.setTag('og:image', this.video.previewPath)
+
+    this.metaService.setTag('og:duration', this.video.duration.toString())
+
+    this.metaService.setTag('og:site_name', 'PeerTube')
+
+    this.metaService.setTag('og:url', window.location.href)
+    this.metaService.setTag('url', window.location.href)
+  }
 }