MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(embed): fix crash when API returns relative URL 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2493>
This commit is contained in:
Kasper Seweryn 2023-06-16 17:55:05 +00:00 committed by Marge
parent 1e3c8081b5
commit 58d48a061e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/2163.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed embedded player crash when API returns relative listen URL. (#2163)

8
front/public/embed.html
View File

@ -73,7 +73,13 @@
// NOTE: Add a transcoded MP3 src at the end for browsers // NOTE: Add a transcoded MP3 src at the end for browsers
// that do not support other codecs to be able to play it :) // that do not support other codecs to be able to play it :)
if (sources.length > 0 && !sources.some(({ mimetype }) => mimetype === 'audio/mpeg')) { if (sources.length > 0 && !sources.some(({ mimetype }) => mimetype === 'audio/mpeg')) {
const url = new URL(sources[0].listen_url) const source = sources[0].listen_url
const url = new URL(source.test(/^https?:/)
? source
: source[0] === '/'
? `${baseUrl}${source}`
: `${baseUrl}/${source}`
)
url.searchParams.set('to', 'mp3') url.searchParams.set('to', 'mp3')
sources.push({ mimetype: 'audio/mpeg', listen_url: url.toString() }) sources.push({ mimetype: 'audio/mpeg', listen_url: url.toString() })
} }