X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.ts;h=33de901c02f9a24c4d42368e706d63ecf33fce35;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=4df2c6c5ee882f8fcf02c00564ccdfb784bdb401;hpb=3c6a44a18175b85d2a3e0b7c3e975718833e5345;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 4df2c6c5e..33de901c0 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -4,18 +4,28 @@ import { catchError } from 'rxjs/operators'
import { PlatformLocation } from '@angular/common'
import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, AuthUser, ConfirmService, MarkdownService, Notifier, RestExtractor, ServerService, UserService } from '@app/core'
+import {
+ AuthService,
+ AuthUser,
+ ConfirmService,
+ MarkdownService,
+ Notifier,
+ PeerTubeSocket,
+ RestExtractor,
+ ServerService,
+ UserService
+} from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service'
import { RedirectService } from '@app/core/routing/redirect.service'
import { isXPercentInViewport, scrollToTop } from '@app/helpers'
import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
import { VideoShareComponent } from '@app/shared/shared-share-modal'
import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
-import { VideoDownloadComponent } from '@app/shared/shared-video-miniature'
+import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
import { MetaService } from '@ngx-meta/core'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
-import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
+import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
@@ -29,6 +39,9 @@ import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
import { environment } from '../../../environments/environment'
import { VideoSupportComponent } from './modal/video-support.component'
import { VideoWatchPlaylistComponent } from './video-watch-playlist.component'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+
+type URLOptions = CustomizationOptions & { playerMode: PlayerMode }
@Component({
selector: 'my-video-watch',
@@ -53,6 +66,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
video: VideoDetails = null
videoCaptions: VideoCaption[] = []
+ playlistPosition: number
playlist: VideoPlaylist = null
completeDescriptionShown = false
@@ -69,12 +83,25 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
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 nextVideoTitle = ''
private currentTime: number
private paramsSub: Subscription
private queryParamsSub: Subscription
private configSub: Subscription
+ private liveVideosSub: Subscription
private serverConfig: ServerConfig
@@ -98,6 +125,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private videoCaptionService: VideoCaptionService,
private hotkeysService: HotkeysService,
private hooks: HooksService,
+ private peertubeSocket: PeerTubeSocket,
private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
) {
@@ -116,6 +144,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
async ngOnInit () {
+ PeertubePlayerManager.initState()
+
this.serverConfig = this.serverService.getTmpConfig()
this.configSub = this.serverService.getConfig()
@@ -140,9 +170,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
if (playlistId) this.loadPlaylist(playlistId)
})
- this.queryParamsSub = this.route.queryParams.subscribe(async queryParams => {
- const videoId = queryParams[ 'videoId' ]
- if (videoId) this.loadVideo(videoId)
+ this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
+ this.playlistPosition = queryParams[ 'playlistPosition' ]
+ this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
const start = queryParams[ 'start' ]
if (this.player && start) this.player.currentTime(parseInt(start, 10))
@@ -162,6 +192,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
if (this.paramsSub) this.paramsSub.unsubscribe()
if (this.queryParamsSub) this.queryParamsSub.unsubscribe()
if (this.configSub) this.configSub.unsubscribe()
+ if (this.liveVideosSub) this.liveVideosSub.unsubscribe()
// Unbind hotkeys
this.hotkeysService.remove(this.hotkeys)
@@ -186,7 +217,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
getRatePopoverText () {
if (this.isUserLoggedIn()) return undefined
- return $localize`You need to be connected to rate this content.`
+ return $localize`You need to be logged in to rate this video.`
}
showMoreDescription () {
@@ -208,7 +239,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
isVideoDownloadable () {
- return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled
+ return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled && !this.video.isLive
}
loadCompleteDescription () {
@@ -303,6 +334,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
return this.video && this.video.scheduledUpdate !== undefined
}
+ isLive () {
+ return !!(this.video?.isLive)
+ }
+
+ isWaitingForLive () {
+ return this.video?.state.id === VideoState.WAITING_FOR_LIVE
+ }
+
+ isLiveEnded () {
+ return this.video?.state.id === VideoState.LIVE_ENDED
+ }
+
isVideoBlur (video: Video) {
return video.isVideoNSFWForUser(this.user, this.serverConfig)
}
@@ -335,6 +378,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
return genericChannelDisplayName.includes(this.video.channel.displayName)
}
+ onPlaylistVideoFound (videoId: string) {
+ this.loadVideo(videoId)
+ }
+
private loadVideo (videoId: string) {
// Video did not change
if (this.video && this.video.uuid === videoId) return
@@ -356,7 +403,36 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
])
.pipe(
// If 401, the video is private or blocked so redirect to 404
- catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
+ catchError(err => {
+ if (err.body.errorCode === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && err.body.originUrl) {
+ const search = window.location.search
+ let originUrl = err.body.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: ${originUrl}?`,
+ $localize`Redirection`
+ ).then(res => {
+ if (res === false) {
+ return this.restExtractor.redirectTo404IfNotFound(err, [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.UNAUTHORIZED_401,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ])
+ }
+
+ return window.location.href = originUrl
+ })
+ }
+
+ return this.restExtractor.redirectTo404IfNotFound(err, [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.UNAUTHORIZED_401,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ])
+ })
)
.subscribe(([ video, captionsResult ]) => {
const queryParams = this.route.snapshot.queryParams
@@ -387,13 +463,17 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.playlistService.getVideoPlaylist(playlistId)
.pipe(
// If 401, the video is private or blocked so redirect to 404
- catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
+ catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.UNAUTHORIZED_401,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ]))
)
.subscribe(playlist => {
this.playlist = playlist
- const videoId = this.route.snapshot.queryParams['videoId']
- this.videoWatchPlaylist.loadPlaylistElements(playlist, !videoId)
+ this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition)
})
}
@@ -447,8 +527,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private async onVideoFetched (
video: VideoDetails,
videoCaptions: VideoCaption[],
- urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+ urlOptions: URLOptions
) {
+ this.subscribeToLiveEventsIfNeeded(this.video, video)
+
this.video = video
this.videoCaptions = videoCaptions
@@ -458,8 +540,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.remoteServerDown = false
this.currentTime = undefined
- this.videoWatchPlaylist.updatePlaylistIndex(video)
-
if (this.isVideoBlur(this.video)) {
const res = await this.confirmService.confirm(
$localize`This video contains mature or explicit content. Are you sure you want to watch it?`,
@@ -468,6 +548,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
if (res === false) return this.location.back()
}
+ const videoState = this.video.state.id
+ if (videoState === VideoState.LIVE_ENDED || videoState === VideoState.WAITING_FOR_LIVE) return
+
// Flush old player if needed
this.flushPlayer()
@@ -542,11 +625,17 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
})
+ this.player.one('ended', () => {
+ if (this.video.isLive) {
+ this.video.state.id = VideoState.LIVE_ENDED
+ }
+ })
+
this.player.on('theaterChange', (_: any, enabled: boolean) => {
this.zone.run(() => this.theaterEnabled = enabled)
})
- this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player })
+ this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player, videojs, video: this.video })
})
this.setVideoDescriptionHTML()
@@ -706,6 +795,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
: null,
embedUrl: video.embedUrl,
+ isLive: video.isLive,
+
language: this.localeId,
userWatching: user && user.videosHistoryEnabled === true ? {
@@ -773,6 +864,34 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
return !this.player.paused()
}
+ private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) {
+ if (!this.liveVideosSub) {
+ this.liveVideosSub = this.peertubeSocket.getLiveVideosObservable()
+ .subscribe(({ payload }) => {
+ if (payload.state !== 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.')
+
+ const videoUUID = this.video.uuid
+
+ // Reset to refetch the video
+ this.video = undefined
+ this.loadVideo(videoUUID)
+ })
+ }
+
+ if (oldVideo && oldVideo.id !== newVideo.id) {
+ await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+ }
+
+ if (!newVideo.isLive) return
+
+ await this.peertubeSocket.subscribeToLiveVideosSocket(newVideo.id)
+ }
+
private initHotkeys () {
this.hotkeys = [
// These hotkeys are managed by the player