import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { forkJoin, Subscription } from 'rxjs'
+import { isP2PEnabled } from 'src/assets/player/utils'
import { PlatformLocation } from '@angular/common'
import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
RestExtractor,
ScreenService,
ServerService,
+ User,
UserService
} from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service'
'filter:api.video-watch.video.get.result'
)
- forkJoin([ videoObs, this.videoCaptionService.listCaptions(videoId) ])
- .subscribe({
- next: ([ video, captionsResult ]) => {
- const queryParams = this.route.snapshot.queryParams
+ forkJoin([
+ videoObs,
+ this.videoCaptionService.listCaptions(videoId),
+ this.userService.getAnonymousOrLoggedUser()
+ ]).subscribe({
+ next: ([ video, captionsResult, loggedInOrAnonymousUser ]) => {
+ const queryParams = this.route.snapshot.queryParams
- const urlOptions = {
- resume: queryParams.resume,
+ const urlOptions = {
+ resume: queryParams.resume,
- startTime: queryParams.start,
- stopTime: queryParams.stop,
+ startTime: queryParams.start,
+ stopTime: queryParams.stop,
- muted: queryParams.muted,
- loop: queryParams.loop,
- subtitle: queryParams.subtitle,
+ muted: queryParams.muted,
+ loop: queryParams.loop,
+ subtitle: queryParams.subtitle,
- playerMode: queryParams.mode,
- peertubeLink: false
- }
+ playerMode: queryParams.mode,
+ peertubeLink: false
+ }
- this.onVideoFetched(video, captionsResult.data, urlOptions)
- .catch(err => this.handleGlobalError(err))
- },
+ this.onVideoFetched({ video, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions })
+ .catch(err => this.handleGlobalError(err))
+ },
- error: err => this.handleRequestError(err)
- })
+ error: err => this.handleRequestError(err)
+ })
}
private loadPlaylist (playlistId: string) {
private async handleRequestError (err: any) {
const errorBody = err.body as PeerTubeProblemDocument
- if (errorBody.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) {
+ if (errorBody?.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) {
const originUrl = errorBody.originUrl + (window.location.search ?? '')
const res = await this.confirmService.confirm(
this.notifier.error(errorMessage)
}
- private async onVideoFetched (
- video: VideoDetails,
- videoCaptions: VideoCaption[],
+ private async onVideoFetched (options: {
+ video: VideoDetails
+ videoCaptions: VideoCaption[]
urlOptions: URLOptions
- ) {
+ loggedInOrAnonymousUser: User
+ }) {
+ const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options
+
this.subscribeToLiveEventsIfNeeded(this.video, video)
this.video = video
if (res === false) return this.location.back()
}
- this.buildPlayer(urlOptions)
+ this.buildPlayer(urlOptions, loggedInOrAnonymousUser)
.catch(err => console.error('Cannot build the player', err))
this.setOpenGraphTags()
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()
video: this.video,
videoCaptions: this.videoCaptions,
urlOptions,
+ loggedInOrAnonymousUser,
user: this.user
}
const { playerMode, playerOptions } = await this.hooks.wrapFun(
})
}
+ private hasNextVideo () {
+ if (this.playlist) {
+ return this.videoWatchPlaylist.hasNextVideo()
+ }
+
+ return true
+ }
+
private playNextVideoInAngularZone () {
if (this.playlist) {
this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
video: VideoDetails
videoCaptions: VideoCaption[]
urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+ loggedInOrAnonymousUser: User
user?: AuthUser
}) {
- const { video, videoCaptions, urlOptions, user } = params
+ const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser, user } = params
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
const options: PeertubePlayerManagerOptions = {
common: {
autoplay: this.isAutoplay(),
+ p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled),
+
+ hasNextVideo: () => this.hasNextVideo(),
nextVideo: () => this.playNextVideoInAngularZone(),
playerElement: this.playerElement,
// 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())
}
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)
})
}
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.')
return
console.log('Updating live views.')
- this.video.views = newViews
+ this.video.viewers = newViewers
}
private initHotkeys () {