imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3694 from matrix-org/t3chguy/fix_SpecPermalinkConstructor

Browse source 
Fix ?via= args in SpecPermalinkConstructor.js
This commit is contained in:
Michael Telatynski 2019-12-08 10:04:41 +00:00 • committed by GitHub
commit 142a71cc67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/utils/permalinks/SpecPermalinkConstructor.js
View file

@ -73,18 +73,16 @@ export default class SpecPermalinkConstructor extends PermalinkConstructor {
// Probably a group, no further parsing needed.
return PermalinkParts.forGroup(entity);
} else if (entity[0] === '#' || entity[0] === '!') {
if (parts.length === 1) {
return PermalinkParts.forRoom(entity, []);
if (parts.length === 1) { // room without event permalink
const [roomId, query=""] = entity.split("?");
const via = query.split(/&?via=/g).filter(p => !!p);
return PermalinkParts.forRoom(roomId, via);
}
// rejoin the rest because v3 events can have slashes (annoyingly)
const eventIdAndQuery = parts.length > 1 ? parts.slice(1).join('/') : "";
const secondaryParts = eventIdAndQuery.split("?");
const eventId = secondaryParts[0];
const query = secondaryParts.length > 1 ? secondaryParts[1] : "";
const via = query.split("via=").filter(p => !!p);
const [eventId, query=""] = eventIdAndQuery.split("?");
const via = query.split(/&?via=/g).filter(p => !!p);
return PermalinkParts.forEvent(entity, eventId, via);
} else {