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=bb0830d992b2c9879eddecb3aaca8e810e7c2023;hpb=4504f09f6e85f09b0489debb547a17209d7176ea;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 bb0830d99..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,17 +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 { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
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 { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
import { MetaService } from '@ngx-meta/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
+import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
+import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
@@ -26,10 +37,11 @@ import {
} from '../../../assets/player/peertube-player-manager'
import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
import { environment } from '../../../environments/environment'
-import { VideoShareComponent } from './modal/video-share.component'
import { VideoSupportComponent } from './modal/video-support.component'
import { VideoWatchPlaylistComponent } from './video-watch-playlist.component'
-import { VideoDownloadComponent } from '@app/shared/shared-video-miniature'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+
+type URLOptions = CustomizationOptions & { playerMode: PlayerMode }
@Component({
selector: 'my-video-watch',
@@ -54,6 +66,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
video: VideoDetails = null
videoCaptions: VideoCaption[] = []
+ playlistPosition: number
playlist: VideoPlaylist = null
completeDescriptionShown = false
@@ -70,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
@@ -97,16 +123,16 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private zone: NgZone,
private redirectService: RedirectService,
private videoCaptionService: VideoCaptionService,
- private i18n: I18n,
private hotkeysService: HotkeysService,
private hooks: HooksService,
+ private peertubeSocket: PeerTubeSocket,
private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
) {
- this.tooltipLike = this.i18n('Like this video')
- this.tooltipDislike = this.i18n('Dislike this video')
- this.tooltipSupport = this.i18n('Support options for this video')
- this.tooltipSaveToPlaylist = this.i18n('Save to playlist')
+ this.tooltipLike = $localize`Like this video`
+ this.tooltipDislike = $localize`Dislike this video`
+ this.tooltipSupport = $localize`Support options for this video`
+ this.tooltipSaveToPlaylist = $localize`Save to playlist`
}
get user () {
@@ -118,6 +144,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
async ngOnInit () {
+ PeertubePlayerManager.initState()
+
this.serverConfig = this.serverService.getTmpConfig()
this.configSub = this.serverService.getConfig()
@@ -142,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))
@@ -163,6 +191,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
// Unsubscribe subscriptions
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)
@@ -187,7 +217,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
getRatePopoverText () {
if (this.isUserLoggedIn()) return undefined
- return this.i18n('You need to be connected to rate this content.')
+ return $localize`You need to be logged in to rate this video.`
}
showMoreDescription () {
@@ -209,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 () {
@@ -235,15 +265,24 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
showSupportModal () {
+ // Check video was playing before opening support modal
+ const isVideoPlaying = this.isPlaying()
+
this.pausePlayer()
- this.videoSupportModal.show()
+ const modalRef = this.videoSupportModal.show()
+
+ modalRef.result.then(() => {
+ if (isVideoPlaying) {
+ this.resumePlayer()
+ }
+ })
}
showShareModal () {
this.pausePlayer()
- this.videoShareModal.show(this.currentTime)
+ this.videoShareModal.show(this.currentTime, this.videoWatchPlaylist.currentPlaylistPosition)
}
isUserLoggedIn () {
@@ -295,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)
}
@@ -327,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
@@ -348,12 +403,43 @@ 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
const urlOptions = {
+ resume: queryParams.resume,
+
startTime: queryParams.start,
stopTime: queryParams.stop,
@@ -377,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)
})
}
@@ -399,10 +489,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
private setVideoLikesBarTooltipText () {
- this.likesBarTooltipText = this.i18n('{{likesNumber}} likes / {{dislikesNumber}} dislikes', {
- likesNumber: this.video.likes,
- dislikesNumber: this.video.dislikes
- })
+ this.likesBarTooltipText = `${this.video.likes} likes / ${this.video.dislikes} dislikes`
}
private handleError (err: any) {
@@ -440,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
@@ -451,16 +540,17 @@ 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(
- this.i18n('This video contains mature or explicit content. Are you sure you want to watch it?'),
- this.i18n('Mature or explicit content')
+ $localize`This video contains mature or explicit content. Are you sure you want to watch it?`,
+ $localize`Mature or explicit content`
)
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()
@@ -505,9 +595,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
*/
this.player.upnext({
timeout: 10000, // 10s
- headText: this.i18n('Up Next'),
- cancelText: this.i18n('Cancel'),
- suspendedText: this.i18n('Autoplay is suspended'),
+ headText: $localize`Up Next`,
+ cancelText: $localize`Cancel`,
+ suspendedText: $localize`Autoplay is suspended`,
getTitle: () => this.nextVideoTitle,
next: () => this.zone.run(() => this.autoplayNext()),
condition: () => {
@@ -535,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()
@@ -652,16 +748,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
const byUrl = urlOptions.startTime !== undefined
const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined)
- if (byUrl) {
- return timeToInt(urlOptions.startTime)
- } else if (byHistory) {
- return video.userHistory.currentTime
- } else {
- return 0
- }
+ if (byUrl) return timeToInt(urlOptions.startTime)
+ if (byHistory) return video.userHistory.currentTime
+
+ return 0
}
let startTime = getStartTime()
+
// If we are at the end of the video, reset the timer
if (video.duration - startTime <= 1) startTime = 0
@@ -701,6 +795,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
: null,
embedUrl: video.embedUrl,
+ isLive: video.isLive,
+
language: this.localeId,
userWatching: user && user.videosHistoryEnabled === true ? {
@@ -756,25 +852,65 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.player.pause()
}
+ private resumePlayer () {
+ if (!this.player) return
+
+ this.player.play()
+ }
+
+ private isPlaying () {
+ if (!this.player) return
+
+ 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
- new Hotkey('f', e => e, undefined, this.i18n('Enter/exit fullscreen (requires player focus)')),
- new Hotkey('space', e => e, undefined, this.i18n('Play/Pause the video (requires player focus)')),
- new Hotkey('m', e => e, undefined, this.i18n('Mute/unmute the video (requires player focus)')),
+ 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('0-9', e => e, undefined, this.i18n('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% (requires player focus)`),
- new Hotkey('up', e => e, undefined, this.i18n('Increase the volume (requires player focus)')),
- new Hotkey('down', e => e, undefined, this.i18n('Decrease the volume (requires player focus)')),
+ 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('right', e => e, undefined, this.i18n('Seek the video forward (requires player focus)')),
- new Hotkey('left', e => e, undefined, this.i18n('Seek the video backward (requires player focus)')),
+ 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('>', e => e, undefined, this.i18n('Increase playback rate (requires player focus)')),
- new Hotkey('<', e => e, undefined, this.i18n('Decrease playback rate (requires player focus)')),
+ 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, this.i18n('Navigate in the video frame by frame (requires player focus)'))
+ new Hotkey('.', e => e, undefined, $localize`Navigate in the video frame by frame (requires player focus)`)
]
if (this.isUserLoggedIn()) {
@@ -782,17 +918,17 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
new Hotkey('shift+l', () => {
this.setLike()
return false
- }, undefined, this.i18n('Like the video')),
+ }, undefined, $localize`Like the video`),
new Hotkey('shift+d', () => {
this.setDislike()
return false
- }, undefined, this.i18n('Dislike the video')),
+ }, undefined, $localize`Dislike the video`),
new Hotkey('shift+s', () => {
this.subscribeButton.subscribed ? this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe()
return false
- }, undefined, this.i18n('Subscribe to the account'))
+ }, undefined, $localize`Subscribe to the account`)
])
}