N0VA/out-of-your-element
0
1
Fork 0
Code Issues Pull Requests Releases Activity

Relax mxc regexp

Browse Source 
The spec doesn't say which characters are permitted in the opaque ID,
but in real life we at least need a hyphen. For lack of a better
reference, I copied gomuks.
This commit is contained in:
Cadence Ember
2026-07-03 22:35:10 +12:00
parent 47ccf986d8
commit cad815896b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/matrix/api.js
+1 -1
View File
@@ -474,7 +474,7 @@ async function ping() {
async function getMedia(mxc, init = {}) { async function getMedia(mxc, init = {}) {
init = {...init} init = {...init}
const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/(\w+)$/) const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/([a-zA-Z0-9_-]+)$/)
assert(mediaParts) assert(mediaParts)
let route = "download" let route = "download"
src/matrix/utils.js
+1 -1
View File
@@ -250,7 +250,7 @@ function getPublicUrlForMxc(mxc) {
*/ */
function makeMxcPublic(mxc) { function makeMxcPublic(mxc) {
assert(hasher, "xxhash is not ready yet") assert(hasher, "xxhash is not ready yet")
const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/(\w+)$/) const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/([a-zA-Z0-9_-]+)$/)
if (!mediaParts) return undefined if (!mediaParts) return undefined
const serverAndMediaID = `${mediaParts[1]}/${mediaParts[2]}` const serverAndMediaID = `${mediaParts[1]}/${mediaParts[2]}`