import { forkJoin, Subscription } from 'rxjs'
import * as videojs from 'video.js'
import 'videojs-hotkeys'
+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import * as WebTorrent from 'webtorrent'
-import { UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
+import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
import '../../../assets/player/peertube-videojs-plugin'
import { AuthService, ConfirmService } from '../../core'
import { RestExtractor, VideoBlacklistService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
-import { Video } from '../../shared/video/video.model'
import { VideoService } from '../../shared/video/video.service'
import { MarkdownService } from '../shared'
import { VideoDownloadComponent } from './modal/video-download.component'
import { VideoReportComponent } from './modal/video-report.component'
import { VideoShareComponent } from './modal/video-share.component'
-import { addContextMenu, getVideojsOptions, loadLocale } from '../../../assets/player/peertube-player'
+import { VideoBlacklistComponent } from './modal/video-blacklist.component'
+import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
+import { addContextMenu, getVideojsOptions, loadLocaleInVideoJS } from '../../../assets/player/peertube-player'
import { ServerService } from '@app/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { environment } from '../../../environments/environment'
import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
import { VideoCaptionService } from '@app/shared/video-caption'
-import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model'
@Component({
selector: 'my-video-watch',
@ViewChild('videoShareModal') videoShareModal: VideoShareComponent
@ViewChild('videoReportModal') videoReportModal: VideoReportComponent
@ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
-
- otherVideosDisplayed: Video[] = []
+ @ViewChild('videoBlacklistModal') videoBlacklistModal: VideoBlacklistComponent
+ @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
player: videojs.Player
playerElement: HTMLVideoElement
likesBarTooltipText = ''
hasAlreadyAcceptedPrivacyConcern = false
remoteServerDown = false
+ hotkeys: Hotkey[]
private videojsLocaleLoaded = false
- private otherVideos: Video[] = []
private paramsSub: Subscription
constructor (
private redirectService: RedirectService,
private videoCaptionService: VideoCaptionService,
private i18n: I18n,
+ private hotkeysService: HotkeysService,
@Inject(LOCALE_ID) private localeId: string
) {}
this.hasAlreadyAcceptedPrivacyConcern = true
}
- this.videoService.getVideos({ currentPage: 1, itemsPerPage: 5 }, '-createdAt')
- .subscribe(
- data => {
- this.otherVideos = data.videos
- this.updateOtherVideosDisplayed()
- },
-
- err => console.error(err)
- )
-
this.paramsSub = this.route.params.subscribe(routeParams => {
const uuid = routeParams[ 'uuid' ]
this.videoCaptionService.listCaptions(uuid)
)
.pipe(
- catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
+ // If 401, the video is private or blacklisted so redirect to 404
+ catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 404 ]))
)
.subscribe(([ video, captionsResult ]) => {
const startTime = this.route.snapshot.queryParams.start
.catch(err => this.handleError(err))
})
})
+
+ this.hotkeys = [
+ new Hotkey('shift+l', (event: KeyboardEvent): boolean => {
+ this.setLike()
+ return false
+ }, undefined, 'Like the video'),
+ new Hotkey('shift+d', (event: KeyboardEvent): boolean => {
+ this.setDislike()
+ return false
+ }, undefined, 'Dislike the video'),
+ new Hotkey('shift+s', (event: KeyboardEvent): boolean => {
+ this.subscribeButton.subscribed ?
+ this.subscribeButton.unsubscribe() :
+ this.subscribeButton.subscribe()
+ return false
+ }, undefined, 'Subscribe to the account')
+ ]
+ if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
}
ngOnDestroy () {
// Unsubscribe subscriptions
this.paramsSub.unsubscribe()
+
+ // Unbind hotkeys
+ if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys)
}
setLike () {
}
}
- async blacklistVideo (event: Event) {
- event.preventDefault()
-
- const res = await this.confirmService.confirm(this.i18n('Do you really want to blacklist this video?'), this.i18n('Blacklist'))
- if (res === false) return
-
- this.videoBlacklistService.blacklistVideo(this.video.id)
- .subscribe(
- () => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Video {{videoName}} had been blacklisted.', { videoName: this.video.name })
- )
- this.redirectService.redirectToHomepage()
- },
-
- error => this.notificationsService.error(this.i18n('Error'), error.message)
- )
- }
-
showMoreDescription () {
if (this.completeVideoDescription === undefined) {
return this.loadCompleteDescription()
}
showShareModal () {
- this.videoShareModal.show()
+ const currentTime = this.player ? this.player.currentTime() : undefined
+
+ this.videoShareModal.show(currentTime)
}
showDownloadModal (event: Event) {
this.videoDownloadModal.show()
}
+ showBlacklistModal (event: Event) {
+ event.preventDefault()
+ this.videoBlacklistModal.show()
+ }
+
+ async unblacklistVideo (event: Event) {
+ event.preventDefault()
+
+ const confirmMessage = this.i18n(
+ 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.'
+ )
+
+ const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblacklist'))
+ if (res === false) return
+
+ this.videoBlacklistService.removeVideoFromBlacklist(this.video.id).subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name })
+ )
+
+ this.video.blacklisted = false
+ this.video.blacklistedReason = null
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
return this.video.isBlackistableBy(this.user)
}
- getVideoPoster () {
- if (!this.video) return ''
-
- return this.video.previewUrl
+ isVideoUnblacklistable () {
+ return this.video.isUnblacklistableBy(this.user)
}
getVideoTags () {
this.completeDescriptionShown = false
this.remoteServerDown = false
- this.updateOtherVideosDisplayed()
-
if (this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())) {
const res = await this.confirmService.confirm(
this.i18n('This video contains mature or explicit content. Are you sure you want to watch it?'),
peertubeLink: false,
poster: this.video.previewUrl,
startTime,
- theaterMode: true
+ theaterMode: true,
+ language: this.localeId
})
if (this.videojsLocaleLoaded === false) {
- await loadLocale(environment.apiUrl, videojs, isOnDevLocale() ? getDevLocale() : this.localeId)
+ await loadLocaleInVideoJS(environment.apiUrl, videojs, isOnDevLocale() ? getDevLocale() : this.localeId)
this.videojsLocaleLoaded = true
}
this.setVideoLikesBarTooltipText()
}
- private updateOtherVideosDisplayed () {
- if (this.video && this.otherVideos && this.otherVideos.length > 0) {
- this.otherVideosDisplayed = this.otherVideos.filter(v => v.uuid !== this.video.uuid)
- }
- }
-
private setOpenGraphTags () {
this.metaService.setTitle(this.video.name)