import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { forkJoin, Observable, Subscription } from 'rxjs'
-import { catchError } from 'rxjs/operators'
+import { forkJoin, Subscription } from 'rxjs'
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, AuthUser, ConfirmService, MarkdownService, Notifier, RestExtractor, ServerService, UserService } from '@app/core'
+import {
+ AuthService,
+ AuthUser,
+ ConfirmService,
+ MetaService,
+ Notifier,
+ PeerTubeSocket,
+ PluginService,
+ RestExtractor,
+ ScreenService,
+ 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 { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
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 { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
+import { timeToInt } from '@shared/core-utils'
+import {
+ HTMLServerConfig,
+ HttpStatusCode,
+ PeerTubeProblemDocument,
+ ServerErrorCode,
+ VideoCaption,
+ VideoPrivacy,
+ VideoState
+} from '@shared/models'
+import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
P2PMediaLoaderOptions,
PlayerMode,
videojs
} 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 { VideoWatchPlaylistComponent } from './shared'
+
+type URLOptions = CustomizationOptions & { playerMode: PlayerMode }
@Component({
selector: 'my-video-watch',
styleUrls: [ './video-watch.component.scss' ]
})
export class VideoWatchComponent implements OnInit, OnDestroy {
- private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern'
-
@ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
- @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
- @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
@ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
- @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent
player: any
playerElement: HTMLVideoElement
+ playerPlaceholderImgSrc: string
theaterEnabled = false
- userRating: UserVideoRateType = null
- descriptionLoading = false
video: VideoDetails = null
videoCaptions: VideoCaption[] = []
+ playlistPosition: number
playlist: VideoPlaylist = null
- completeDescriptionShown = false
- completeVideoDescription: string
- shortVideoDescription: string
- videoHTMLDescription = ''
- likesBarTooltipText = ''
- hasAlreadyAcceptedPrivacyConcern = false
remoteServerDown = false
- hotkeys: Hotkey[] = []
- tooltipLike = ''
- tooltipDislike = ''
- tooltipSupport = ''
- tooltipSaveToPlaylist = ''
-
- private nextVideoUuid = ''
+ private nextVideoUUID = ''
private nextVideoTitle = ''
+
private currentTime: number
+
private paramsSub: Subscription
private queryParamsSub: Subscription
private configSub: Subscription
+ private liveVideosSub: Subscription
+
+ private serverConfig: HTMLServerConfig
- private serverConfig: ServerConfig
+ private hotkeys: Hotkey[] = []
constructor (
private elementRef: ElementRef,
- private changeDetector: ChangeDetectorRef,
private route: ActivatedRoute,
private router: Router,
private videoService: VideoService,
private serverService: ServerService,
private restExtractor: RestExtractor,
private notifier: Notifier,
- private markdownService: MarkdownService,
private zone: NgZone,
- private redirectService: RedirectService,
private videoCaptionService: VideoCaptionService,
- private i18n: I18n,
private hotkeysService: HotkeysService,
private hooks: HooksService,
+ private pluginService: PluginService,
+ private peertubeSocket: PeerTubeSocket,
+ private screenService: ScreenService,
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')
- }
+ ) { }
get user () {
return this.authService.getUser()
return this.userService.getAnonymousUser()
}
- async ngOnInit () {
- this.serverConfig = this.serverService.getTmpConfig()
-
- this.configSub = this.serverService.getConfig()
- .subscribe(config => {
- this.serverConfig = config
-
- if (
- isWebRTCDisabled() ||
- this.serverConfig.tracker.enabled === false ||
- getStoredP2PEnabled() === false ||
- peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true'
- ) {
- this.hasAlreadyAcceptedPrivacyConcern = true
- }
- })
-
- this.paramsSub = this.route.params.subscribe(routeParams => {
- const videoId = routeParams[ 'videoId' ]
- if (videoId) this.loadVideo(videoId)
+ ngOnInit () {
+ this.serverConfig = this.serverService.getHTMLConfig()
- const playlistId = routeParams[ 'playlistId' ]
- if (playlistId) this.loadPlaylist(playlistId)
- })
+ PeertubePlayerManager.initState()
- this.queryParamsSub = this.route.queryParams.subscribe(async queryParams => {
- const videoId = queryParams[ 'videoId' ]
- if (videoId) this.loadVideo(videoId)
-
- const start = queryParams[ 'start' ]
- if (this.player && start) this.player.currentTime(parseInt(start, 10))
- })
+ this.loadRouteParams()
+ this.loadRouteQuery()
this.initHotkeys()
this.theaterEnabled = getStoredTheater()
this.hooks.runAction('action:video-watch.init', 'video-watch')
+
+ setTimeout(cleanupVideoWatch, 1500) // Run in timeout to ensure we're not blocking the UI
}
ngOnDestroy () {
// 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)
}
- setLike () {
- if (this.isUserLoggedIn() === false) return
-
- // Already liked this video
- if (this.userRating === 'like') this.setRating('none')
- else this.setRating('like')
- }
-
- setDislike () {
- if (this.isUserLoggedIn() === false) return
-
- // Already disliked this video
- if (this.userRating === 'dislike') this.setRating('none')
- else this.setRating('dislike')
- }
-
- getRatePopoverText () {
- if (this.isUserLoggedIn()) return undefined
-
- return this.i18n('You need to be connected to rate this content.')
- }
-
- showMoreDescription () {
- if (this.completeVideoDescription === undefined) {
- return this.loadCompleteDescription()
- }
-
- this.updateVideoDescription(this.completeVideoDescription)
- this.completeDescriptionShown = true
- }
-
- showLessDescription () {
- this.updateVideoDescription(this.shortVideoDescription)
- this.completeDescriptionShown = false
- }
-
- showDownloadModal () {
- this.videoDownloadModal.show(this.video, this.videoCaptions)
+ getCurrentTime () {
+ return this.currentTime
}
- isVideoDownloadable () {
- return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled
+ getCurrentPlaylistPosition () {
+ return this.videoWatchPlaylist.currentPlaylistPosition
}
- loadCompleteDescription () {
- this.descriptionLoading = true
-
- this.videoService.loadCompleteDescription(this.video.descriptionPath)
- .subscribe(
- description => {
- this.completeDescriptionShown = true
- this.descriptionLoading = false
-
- this.shortVideoDescription = this.video.description
- this.completeVideoDescription = description
-
- this.updateVideoDescription(this.completeVideoDescription)
- },
+ onRecommendations (videos: Video[]) {
+ if (videos.length === 0) return
- error => {
- this.descriptionLoading = false
- this.notifier.error(error.message)
- }
- )
+ // The recommended videos's first element should be the next video
+ const video = videos[0]
+ this.nextVideoUUID = video.uuid
+ this.nextVideoTitle = video.name
}
- showSupportModal () {
- this.pausePlayer()
+ handleTimestampClicked (timestamp: number) {
+ if (!this.player || this.video.isLive) return
- this.videoSupportModal.show()
+ this.player.currentTime(timestamp)
+ scrollToTop()
}
- showShareModal () {
- this.pausePlayer()
-
- this.videoShareModal.show(this.currentTime)
+ onPlaylistVideoFound (videoId: string) {
+ this.loadVideo(videoId)
}
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
- getVideoTags () {
- if (!this.video || Array.isArray(this.video.tags) === false) return []
-
- return this.video.tags
- }
-
- 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
- }
- }
-
- onModalOpened () {
- this.pausePlayer()
- }
-
- onVideoRemoved () {
- this.redirectService.redirectToHomepage()
- }
-
- declinedPrivacyConcern () {
- peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'false')
- this.hasAlreadyAcceptedPrivacyConcern = false
+ isVideoBlur (video: Video) {
+ return video.isVideoNSFWForUser(this.user, this.serverConfig)
}
- acceptedPrivacyConcern () {
- peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'true')
- this.hasAlreadyAcceptedPrivacyConcern = true
- }
+ isChannelDisplayNameGeneric () {
+ const genericChannelDisplayName = [
+ `Main ${this.video.channel.ownerAccount.name} channel`,
+ `Default ${this.video.channel.ownerAccount.name} channel`
+ ]
- isVideoToTranscode () {
- return this.video && this.video.state.id === VideoState.TO_TRANSCODE
+ return genericChannelDisplayName.includes(this.video.channel.displayName)
}
- isVideoToImport () {
- return this.video && this.video.state.id === VideoState.TO_IMPORT
+ displayOtherVideosAsRow () {
+ // Use the same value as in the SASS file
+ return this.screenService.getWindowInnerWidth() <= 1100
}
- hasVideoScheduledPublication () {
- return this.video && this.video.scheduledUpdate !== undefined
- }
+ private loadRouteParams () {
+ this.paramsSub = this.route.params.subscribe(routeParams => {
+ const videoId = routeParams['videoId']
+ if (videoId) return this.loadVideo(videoId)
- isVideoBlur (video: Video) {
- return video.isVideoNSFWForUser(this.user, this.serverConfig)
+ const playlistId = routeParams['playlistId']
+ if (playlistId) return this.loadPlaylist(playlistId)
+ })
}
- isAutoPlayEnabled () {
- return (
- (this.user && this.user.autoPlayNextVideo) ||
- this.anonymousUser.autoPlayNextVideo
- )
- }
+ private loadRouteQuery () {
+ this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
+ // Handle the ?playlistPosition
+ const positionParam = queryParams['playlistPosition'] ?? 1
- handleTimestampClicked (timestamp: number) {
- if (this.player) this.player.currentTime(timestamp)
- scrollToTop()
- }
+ this.playlistPosition = positionParam === 'last'
+ ? -1 // Handle the "last" index
+ : parseInt(positionParam + '', 10)
- isPlaylistAutoPlayEnabled () {
- return (
- (this.user && this.user.autoPlayNextVideoPlaylist) ||
- this.anonymousUser.autoPlayNextVideoPlaylist
- )
- }
+ if (isNaN(this.playlistPosition)) {
+ console.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`)
+ this.playlistPosition = 1
+ }
- isChannelDisplayNameGeneric () {
- const genericChannelDisplayName = [
- `Main ${this.video.channel.ownerAccount.name} channel`,
- `Default ${this.video.channel.ownerAccount.name} channel`
- ]
+ this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
- return genericChannelDisplayName.includes(this.video.channel.displayName)
+ 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) return
+ if (this.isSameElement(this.video, videoId)) return
if (this.player) this.player.pause()
'filter:api.video-watch.video.get.result'
)
- // Video did change
- forkJoin([
- videoObs,
- this.videoCaptionService.listCaptions(videoId)
- ])
- .pipe(
- // If 401, the video is private or blocked so redirect to 404
- catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
- )
- .subscribe(([ video, captionsResult ]) => {
- const queryParams = this.route.snapshot.queryParams
+ forkJoin([ videoObs, this.videoCaptionService.listCaptions(videoId) ])
+ .subscribe({
+ next: ([ video, captionsResult ]) => {
+ const queryParams = this.route.snapshot.queryParams
- const urlOptions = {
- startTime: queryParams.start,
- stopTime: queryParams.stop,
+ const urlOptions = {
+ resume: queryParams.resume,
- muted: queryParams.muted,
- loop: queryParams.loop,
- subtitle: queryParams.subtitle,
+ startTime: queryParams.start,
+ stopTime: queryParams.stop,
- playerMode: queryParams.mode,
- peertubeLink: false
- }
+ muted: queryParams.muted,
+ loop: queryParams.loop,
+ subtitle: queryParams.subtitle,
+
+ playerMode: queryParams.mode,
+ peertubeLink: false
+ }
- this.onVideoFetched(video, captionsResult.data, urlOptions)
- .catch(err => this.handleError(err))
+ this.onVideoFetched(video, captionsResult.data, 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) return
+ if (this.isSameElement(this.playlist, playlistId)) return
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 ]))
- )
- .subscribe(playlist => {
- this.playlist = playlist
+ .subscribe({
+ next: playlist => {
+ this.playlist = playlist
+
+ this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition)
+ },
- const videoId = this.route.snapshot.queryParams['videoId']
- this.videoWatchPlaylist.loadPlaylistElements(playlist, !videoId)
+ error: err => this.handleRequestError(err)
})
}
- private updateVideoDescription (description: string) {
- this.video.description = description
- this.setVideoDescriptionHTML()
- .catch(err => console.error(err))
- }
+ private isSameElement (element: VideoDetails | VideoPlaylist, newId: string) {
+ if (!element) return false
- private async setVideoDescriptionHTML () {
- const html = await this.markdownService.textMarkdownToHTML(this.video.description)
- this.videoHTMLDescription = await this.markdownService.processVideoTimestamps(html)
+ return (element.id + '') === newId || element.uuid === newId || element.shortUUID === newId
}
- private setVideoLikesBarTooltipText () {
- this.likesBarTooltipText = this.i18n('{{likesNumber}} likes / {{dislikesNumber}} dislikes', {
- likesNumber: this.video.likes,
- dislikesNumber: this.video.dislikes
- })
+ 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 handleError (err: any) {
+ 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
}
this.notifier.error(errorMessage)
}
- private checkUserRating () {
- // Unlogged users do not have ratings
- if (this.isUserLoggedIn() === false) return
-
- this.videoService.getUserVideoRating(this.video.id)
- .subscribe(
- ratingObject => {
- if (ratingObject) {
- this.userRating = ratingObject.rating
- }
- },
-
- err => this.notifier.error(err.message)
- )
- }
-
private async onVideoFetched (
video: VideoDetails,
videoCaptions: VideoCaption[],
- urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+ urlOptions: URLOptions
) {
+ this.subscribeToLiveEventsIfNeeded(this.video, video)
+
this.video = video
this.videoCaptions = videoCaptions
// Re init attributes
- this.descriptionLoading = false
- this.completeDescriptionShown = false
+ this.playerPlaceholderImgSrc = undefined
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()
}
+ this.buildPlayer(urlOptions)
+ .catch(err => console.error('Cannot build the player', err))
+
+ this.setOpenGraphTags()
+
+ const hookOptions = {
+ videojs,
+ video: this.video,
+ playlist: this.playlist
+ }
+ this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', hookOptions)
+ }
+
+ private async buildPlayer (urlOptions: URLOptions) {
// Flush old player if needed
this.flushPlayer()
+ const videoState = this.video.state.id
+ if (videoState === VideoState.LIVE_ENDED || videoState === VideoState.WAITING_FOR_LIVE) {
+ this.playerPlaceholderImgSrc = this.video.previewPath
+ return
+ }
+
// Build video element, because videojs removes it on dispose
const playerElementWrapper = this.elementRef.nativeElement.querySelector('#videojs-wrapper')
this.playerElement = document.createElement('video')
const params = {
video: this.video,
- videoCaptions,
+ videoCaptions: this.videoCaptions,
urlOptions,
user: this.user
}
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', ({ err }: { err: any }) => {
+ this.zone.run(() => this.handleGlobalError(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
- headText: this.i18n('Up Next'),
- cancelText: this.i18n('Cancel'),
- suspendedText: this.i18n('Autoplay is suspended'),
+ 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) ||
})
this.player.one('stopped', () => {
- if (this.playlist) {
- if (this.isPlaylistAutoPlayEnabled()) this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
+ if (this.playlist && this.isPlaylistAutoPlayNext()) {
+ this.playNextVideoInAngularZone()
+ }
+ })
+
+ this.player.one('ended', () => {
+ if (this.video.isLive) {
+ this.zone.run(() => this.video.state.id = VideoState.LIVE_ENDED)
}
})
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()
- this.setVideoLikesBarTooltipText()
-
- this.setOpenGraphTags()
- this.checkUserRating()
-
- this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', { videojs })
}
- private autoplayNext () {
+ private playNextVideoInAngularZone () {
if (this.playlist) {
this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
- } else if (this.nextVideoUuid) {
- this.router.navigate([ '/videos/watch', this.nextVideoUuid ])
+ return
}
- }
- private setRating (nextRating: UserVideoRateType) {
- const ratingMethods: { [id in UserVideoRateType]: (id: number) => Observable<any> } = {
- like: this.videoService.setVideoLike,
- dislike: this.videoService.setVideoDislike,
- none: this.videoService.unsetVideoLike
+ if (this.nextVideoUUID) {
+ this.router.navigate([ '/w', this.nextVideoUUID ])
}
-
- ratingMethods[nextRating].call(this.videoService, this.video.id)
- .subscribe(
- () => {
- // Update the video like attribute
- this.updateVideoRating(this.userRating, nextRating)
- this.userRating = nextRating
- },
-
- (err: { message: string }) => this.notifier.error(err.message)
- )
- }
-
- private updateVideoRating (oldRating: UserVideoRateType, newRating: UserVideoRateType) {
- let likesToIncrement = 0
- let dislikesToIncrement = 0
-
- if (oldRating) {
- if (oldRating === 'like') likesToIncrement--
- if (oldRating === 'dislike') dislikesToIncrement--
- }
-
- if (newRating === 'like') likesToIncrement++
- if (newRating === 'dislike') dislikesToIncrement++
-
- this.video.likes += likesToIncrement
- this.video.dislikes += dislikesToIncrement
-
- this.video.buildLikeAndDislikePercents()
- this.setVideoLikesBarTooltipText()
- }
-
- 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)
}
private isAutoplay () {
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) {
- try {
- this.player.dispose()
- this.player = undefined
- } catch (err) {
- console.error('Cannot dispose player.', err)
- }
+ if (!this.player) return
+
+ try {
+ this.player.dispose()
+ this.player = undefined
+ } catch (err) {
+ console.error('Cannot dispose player.', err)
}
}
private buildPlayerManagerOptions (params: {
- video: VideoDetails,
- videoCaptions: VideoCaption[],
- urlOptions: CustomizationOptions & { playerMode: PlayerMode },
+ video: VideoDetails
+ videoCaptions: VideoCaption[]
+ urlOptions: CustomizationOptions & { playerMode: PlayerMode }
user?: AuthUser
}) {
const { video, videoCaptions, urlOptions, user } = params
+
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined)
+ const byLocalStorage = getStoredVideoWatchHistory(video.uuid)
- 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
+ if (byLocalStorage) return byLocalStorage.duration
+
+ return 0
}
let startTime = getStartTime()
+
// If we are at the end of the video, reset the timer
if (video.duration - startTime <= 1) startTime = 0
const options: PeertubePlayerManagerOptions = {
common: {
autoplay: this.isAutoplay(),
- nextVideo: () => this.zone.run(() => this.autoplayNext()),
+ nextVideo: () => this.playNextVideoInAngularZone(),
playerElement: this.playerElement,
onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,
? this.videoService.getVideoViewUrl(video.uuid)
: null,
embedUrl: video.embedUrl,
+ embedTitle: video.name,
+
+ isLive: video.isLive,
language: this.localeId,
- userWatching: user && user.videosHistoryEnabled === true ? {
- url: this.videoService.getUserWatchingVideoUrl(video.uuid),
- authorizationHeader: this.authService.getRequestHeaderValue()
- } : undefined,
+ userWatching: user && user.videosHistoryEnabled === true
+ ? {
+ url: this.videoService.getUserWatchingVideoUrl(video.uuid),
+ authorizationHeader: this.authService.getRequestHeaderValue()
+ }
+ : undefined,
serverUrl: environment.apiUrl,
- videoCaptions: playerCaptions
+ videoCaptions: playerCaptions,
+
+ videoShortUUID: video.shortUUID,
+ videoUUID: video.uuid
},
webtorrent: {
videoFiles: video.files
+ },
+
+ pluginsManager: this.pluginService.getPluginsManager()
+ }
+
+ // Only set this if we're in a playlist
+ if (this.playlist) {
+ options.common.previousVideo = () => {
+ this.zone.run(() => this.videoWatchPlaylist.navigateToPreviousPlaylistVideo())
}
}
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'
}
return { playerMode: mode, playerOptions: options }
}
- private pausePlayer () {
- if (!this.player) return
+ private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) {
+ if (!this.liveVideosSub) {
+ this.liveVideosSub = this.buildLiveEventsSubscription()
+ }
+
+ if (oldVideo && oldVideo.id !== newVideo.id) {
+ this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+ }
+
+ if (!newVideo.isLive) return
- this.player.pause()
+ await this.peertubeSocket.subscribeToLiveVideosSocket(newVideo.id)
+ }
+
+ private buildLiveEventsSubscription () {
+ 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)
+ })
+ }
+
+ 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.')
+
+ const videoUUID = this.video.uuid
+
+ // Reset to force refresh the video
+ this.video = undefined
+ this.loadVideo(videoUUID)
+ }
+
+ private handleLiveViewsChange (newViews: number) {
+ if (!this.video) {
+ console.error('Cannot update video live views because video is no defined.')
+ return
+ }
+
+ console.log('Updating live views.')
+
+ this.video.views = newViews
}
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()) {
this.hotkeys = this.hotkeys.concat([
- new Hotkey('shift+l', () => {
- this.setLike()
- return false
- }, undefined, this.i18n('Like the video')),
-
- new Hotkey('shift+d', () => {
- this.setDislike()
- return false
- }, undefined, this.i18n('Dislike the video')),
-
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, this.i18n('Subscribe to the account'))
+ }, undefined, $localize`Subscribe to the account`)
])
}
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)
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff