jeena/PeerTube
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Add redirection on unavailable video due to follow constraints

Browse source
This commit is contained in:
Chocobozzz 2020-08-26 09:14:14 +02:00
parent ca00baa75a
commit e6abf95e9f
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/src/app/+videos/+video-watch/video-watch.component.ts
View file

@ -15,7 +15,7 @@ import { VideoDownloadComponent } from '@app/shared/shared-video-miniature'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
import { MetaService } from '@ngx-meta/core'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
@ -361,7 +361,24 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
])
.pipe(
// If 401, the video is private or blocked so redirect to 404
catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
catchError(err => {
if (err.body.errorCode === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && err.body.originUrl) {
const search = window.location.search
let originUrl = err.body.originUrl
if (search) originUrl += search
this.confirmService.confirm(
$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`
).then(res => {
if (res === false) return this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])
return window.location.href = originUrl
})
}
return this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])
})
)
.subscribe(([ video, captionsResult ]) => {
const queryParams = this.route.snapshot.queryParams