OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4280 from matrix-org/dbkr/fix_permalink_crash 

Fix soft-crash on bad permalinks
pull/21833/head
David Baker 2020-03-26 10:54:59 +00:00 committed by GitHub
parent 44ce5b5764 9c20bf22ce
commit 5986bbc561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/linkify-matrix.js
View File

@ -200,6 +200,7 @@ matrixLinkify.options = {
switch (type) { switch (type) {
case "url": { case "url": {
// intercept local permalinks to users and show them like userids (in userinfo of current room) // intercept local permalinks to users and show them like userids (in userinfo of current room)
try {
const permalink = parsePermalink(href); const permalink = parsePermalink(href);
if (permalink && permalink.userId) { if (permalink && permalink.userId) {
return { return {
@ -208,6 +209,9 @@ matrixLinkify.options = {
}, },
}; };
} }
} catch (e) {
// OK fine, it's not actually a permalink
}
break; break;
} }
case "userid": case "userid":