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

fix(embed): standardize `instance` or `b` parameter 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2489>
This commit is contained in:
Kasper Seweryn 2023-06-22 00:34:52 +02:00 committed by Marge
parent 9cee08b264
commit c7e9152590
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/public/embed.html
View File

@ -20,7 +20,7 @@
// Params // Params
const params = new URL(location.href).searchParams const params = new URL(location.href).searchParams
const baseUrl = params.get('instance') ?? params.get('b') ?? '' let baseUrl = params.get('instance') ?? params.get('b') ?? location.origin
const type = params.get('type') const type = params.get('type')
const id = params.get('id') const id = params.get('id')
@ -34,6 +34,14 @@
error.value = `The embed widget couldn't read the provided media ID: ${id}.` error.value = `The embed widget couldn't read the provided media ID: ${id}.`
} }
// Standardize base URL
try {
baseUrl = new URL(baseUrl).origin
} catch (err) {
console.error(err)
error.value = `The embed widget couldn't read the provided instance URL: ${baseUrl}.`
}
// Cover // Cover
const DEFAULT_COVER = '/embed-default-cover.jpeg' const DEFAULT_COVER = '/embed-default-cover.jpeg'
const cover = reactive({ value: DEFAULT_COVER }) const cover = reactive({ value: DEFAULT_COVER })