myriation/doipjs
1
0
Fork 0
forked from Mirrors/doipjs
Code Pull requests Packages 1 Activity

Make matrix URIs compliant with MSC2312

Browse source
This commit is contained in:
Yarmo Mackenbach 2021-03-22 17:38:56 +01:00
parent aebd0eabe8
commit 622d56b47d
No known key found for this signature in database
GPG key ID: 37367F4AF4087AD1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/serviceproviders/matrix.js
View file

@ -17,7 +17,7 @@ const bent = require('bent')
const req = bent('GET') const req = bent('GET')
const queryString = require('query-string') const queryString = require('query-string')
const utils = require('../utils') const utils = require('../utils')
const reURI = /^matrix\:u\/(\@[^:]*\:[^?]*)(\?.*)?/ const reURI = /^matrix\:u\/(?:\@)?([^@:]*\:[^?]*)(\?.*)?/
const processURI = (uri, opts) => { const processURI = (uri, opts) => {
if (!opts) { if (!opts) {
@ -32,7 +32,7 @@ const processURI = (uri, opts) => {
if (match[2]) { if (match[2]) {
const params = queryString.parse(match[2]) const params = queryString.parse(match[2])
if ('org.keyoxide.e' in params && 'org.keyoxide.r' in params) { if ('org.keyoxide.e' in params && 'org.keyoxide.r' in params) {
profileUrl = `https://matrix.to/#/${match[1]}` profileUrl = `https://matrix.to/#/@${match[1]}`
eventUrl = `https://matrix.to/#/${params['org.keyoxide.r']}/${params['org.keyoxide.e']}` eventUrl = `https://matrix.to/#/${params['org.keyoxide.r']}/${params['org.keyoxide.e']}`
proofUrl = utils.generateProxyURL( proofUrl = utils.generateProxyURL(
'matrix', 'matrix',
@ -48,7 +48,7 @@ const processURI = (uri, opts) => {
name: 'matrix', name: 'matrix',
}, },
profile: { profile: {
display: match[1], display: `@${match[1]}`,
uri: profileUrl, uri: profileUrl,
qr: null, qr: null,
}, },
@ -70,12 +70,12 @@ const processURI = (uri, opts) => {
const tests = [ const tests = [
{ {
uri: 'matrix:u/@alice:matrix.domain.org', uri:
'matrix:u/alice:matrix.domain.org?org.keyoxide.r=!123:domain.org&org.keyoxide.e=$123',
shouldMatch: true, shouldMatch: true,
}, },
{ {
uri: uri: 'matrix:u/alice:matrix.domain.org',
'matrix:u/@alice:matrix.domain.org?org.keyoxide.r=!123:domain.org&org.keyoxide.e=$123',
shouldMatch: true, shouldMatch: true,
}, },
{ {