|
@@ -15,7 +15,6 @@ 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'
|
|
@@ -43,8 +42,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
|
|
|
@ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
|
|
|
@ViewChild('videoBlacklistModal') videoBlacklistModal: VideoBlacklistComponent
|
|
|
|
|
|
- otherVideosDisplayed: Video[] = []
|
|
|
-
|
|
|
player: videojs.Player
|
|
|
playerElement: HTMLVideoElement
|
|
|
userRating: UserVideoRateType = null
|
|
@@ -60,7 +57,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
|
|
|
remoteServerDown = false
|
|
|
|
|
|
private videojsLocaleLoaded = false
|
|
|
- private otherVideos: Video[] = []
|
|
|
private paramsSub: Subscription
|
|
|
|
|
|
constructor (
|
|
@@ -96,16 +92,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
|
|
|
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' ]
|
|
|
|
|
@@ -365,8 +351,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
|
|
|
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?'),
|
|
@@ -474,12 +458,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
|
|
|
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)
|
|
|
|