import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { RedirectService } from '@app/core/routing/redirect.service'
-import { peertubeLocalStorage, peertubeSessionStorage } from '@app/shared/misc/peertube-web-storage'
+import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
import { MetaService } from '@ngx-meta/core'
import { AuthUser, Notifier, ServerService } from '@app/core'
import { forkJoin, Observable, Subscription } from 'rxjs'
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
+import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
import { AuthService, ConfirmService } from '../../core'
-import { RestExtractor, VideoBlacklistService } from '../../shared'
+import { RestExtractor, UserService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
import { VideoService } from '../../shared/video/video.service'
import { VideoShareComponent } from './modal/video-share.component'
import { Video } from '@app/shared/video/video.model'
import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component'
-import { getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
-import { PluginService } from '@app/core/plugins/plugin.service'
+import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
import { HooksService } from '@app/core/plugins/hooks.service'
import { PlatformLocation } from '@angular/common'
-import { randomInt } from '@shared/core-utils/miscs/miscs'
-import { RecommendedVideosComponent } from '../recommendations/recommended-videos.component'
+import { scrollToTop, isXPercentInViewport } from '@app/shared/misc/utils'
@Component({
selector: 'my-video-watch',
private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern'
@ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
- @ViewChild('videoShareModal', { static: false }) videoShareModal: VideoShareComponent
- @ViewChild('videoSupportModal', { static: false }) videoSupportModal: VideoSupportComponent
- @ViewChild('subscribeButton', { static: false }) subscribeButton: SubscribeButtonComponent
+ @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
+ @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
+ @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
player: any
playerElement: HTMLVideoElement
tooltipSaveToPlaylist = ''
private nextVideoUuid = ''
+ private nextVideoTitle = ''
private currentTime: number
private paramsSub: Subscription
private queryParamsSub: Subscription
private configSub: Subscription
+ private serverConfig: ServerConfig
+
constructor (
private elementRef: ElementRef,
private changeDetector: ChangeDetectorRef,
private router: Router,
private videoService: VideoService,
private playlistService: VideoPlaylistService,
- private videoBlacklistService: VideoBlacklistService,
private confirmService: ConfirmService,
private metaService: MetaService,
private authService: AuthService,
+ private userService: UserService,
private serverService: ServerService,
private restExtractor: RestExtractor,
private notifier: Notifier,
- private pluginService: PluginService,
private markdownService: MarkdownService,
private zone: NgZone,
private redirectService: RedirectService,
return this.authService.getUser()
}
+ get anonymousUser () {
+ return this.userService.getAnonymousUser()
+ }
+
async ngOnInit () {
- this.configSub = this.serverService.configLoaded
- .subscribe(() => {
+ this.serverConfig = this.serverService.getTmpConfig()
+
+ this.configSub = this.serverService.getConfig()
+ .subscribe(config => {
+ this.serverConfig = config
+
if (
isWebRTCDisabled() ||
- this.serverService.getConfig().tracker.enabled === false ||
+ this.serverConfig.tracker.enabled === false ||
+ getStoredP2PEnabled() === false ||
peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true'
) {
this.hasAlreadyAcceptedPrivacyConcern = true
if (playlistId) this.loadPlaylist(playlistId)
})
- this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
+ 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.initHotkeys()
onRecommendations (videos: Video[]) {
if (videos.length > 0) {
- // Pick a random video until the recommendations are improved
- this.nextVideoUuid = videos[randomInt(0,videos.length - 1)].uuid
+ // The recommended videos's first element should be the next video
+ const video = videos[0]
+ this.nextVideoUuid = video.uuid
+ this.nextVideoTitle = video.name
}
}
this.redirectService.redirectToHomepage()
}
+ declinedPrivacyConcern () {
+ peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'false')
+ this.hasAlreadyAcceptedPrivacyConcern = false
+ }
+
acceptedPrivacyConcern () {
peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'true')
this.hasAlreadyAcceptedPrivacyConcern = true
}
isVideoBlur (video: Video) {
- return video.isVideoNSFWForUser(this.user, this.serverService.getConfig())
+ return video.isVideoNSFWForUser(this.user, this.serverConfig)
}
isAutoPlayEnabled () {
return (
(this.user && this.user.autoPlayNextVideo) ||
- peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
+ this.anonymousUser.autoPlayNextVideo
)
}
+ handleTimestampClicked (timestamp: number) {
+ if (this.player) this.player.currentTime(timestamp)
+ scrollToTop()
+ }
+
isPlaylistAutoPlayEnabled () {
return (
(this.user && this.user.autoPlayNextVideoPlaylist) ||
- peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true'
+ this.anonymousUser.autoPlayNextVideoPlaylist
)
}
this.currentTime = Math.floor(this.player.currentTime())
})
- this.player.one('ended', () => {
- if (this.playlist) {
- if (this.isPlaylistAutoPlayEnabled()) this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
- } else if (this.isAutoPlayEnabled()) {
- this.zone.run(() => this.autoplayNext())
+ /**
+ * 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.
+ */
+ this.player.upnext({
+ timeout: 10000, // 10s
+ headText: this.i18n('Up Next'),
+ cancelText: this.i18n('Cancel'),
+ suspendedText: this.i18n('Autoplay is suspended'),
+ getTitle: () => this.nextVideoTitle,
+ next: () => this.zone.run(() => this.autoplayNext()),
+ 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
+ }
+ return false // upnext will not trigger, and instead leave the video stopping
+ },
+ suspended: () => {
+ return (
+ !isXPercentInViewport(this.player.el(), 80) ||
+ !document.getElementById('content').contains(document.activeElement)
+ )
}
})
const { video, videoCaptions, urlOptions, user } = params
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
- const byHistory = video.userHistory && !this.playlist
+ const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined)
if (byUrl) {
return timeToInt(urlOptions.startTime)
const options: PeertubePlayerManagerOptions = {
common: {
autoplay: this.isAutoplay(),
+ nextVideo: () => this.zone.run(() => this.autoplayNext()),
playerElement: this.playerElement,
onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,
projects / github / Chocobozzz / PeerTube.git / blobdiff