OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix embed video id parsing

pull/1345/head
Chocobozzz 2018-11-15 16:57:59 +01:00
parent 030177d246
commit 6385c0cb7f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/standalone/videos/embed.ts
View File

@ -256,9 +256,8 @@ class PeerTubeEmbed {
} }
private async initCore () { private async initCore () {
const urlParts = window.location.href.split('/') const urlParts = window.location.pathname.split('/')
const lastPart = urlParts[ urlParts.length - 1 ] const videoId = urlParts[ urlParts.length - 1 ]
const videoId = lastPart.indexOf('?') === -1 ? lastPart : lastPart.split('?')[ 0 ]
const [ , serverTranslations, videoResponse, captionsResponse ] = await Promise.all([ const [ , serverTranslations, videoResponse, captionsResponse ] = await Promise.all([
loadLocaleInVideoJS(window.location.origin, vjs, navigator.language), loadLocaleInVideoJS(window.location.origin, vjs, navigator.language),

2
server/lib/job-queue/handlers/video-views.ts
View File

@ -39,7 +39,7 @@ async function processVideosViews () {
}) })
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId) const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
await federateVideoIfNeeded(video, false) if (video.isOwned()) await federateVideoIfNeeded(video, false)
} catch (err) { } catch (err) {
logger.debug('Cannot create video views for video %d in hour %d. Maybe the video does not exist anymore?', videoId, hour) logger.debug('Cannot create video views for video %d in hour %d. Maybe the video does not exist anymore?', videoId, hour)
} }