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

allow :port specifiers in roomalias,groupid and userid as per spec

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-06-26 23:33:35 +01:00
parent f40802e9d8
commit 09b09846cf
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/linkify-matrix.js
View file

@ -41,6 +41,7 @@ function matrixLinkify(linkify) {
const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
const S_ROOMALIAS_COLON = new linkify.parser.State();
const roomname_tokens = [ const roomname_tokens = [
TT.DOT, TT.DOT,
@ -72,6 +73,8 @@ function matrixLinkify(linkify) {
S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS); S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:`
S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS); // but do accept :NUM (port specifier)
const USERID = function(value) { const USERID = function(value) {
@ -87,6 +90,7 @@ function matrixLinkify(linkify) {
const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
const S_USERID = new linkify.parser.State(USERID); const S_USERID = new linkify.parser.State(USERID);
const S_USERID_COLON = new linkify.parser.State();
const username_tokens = [ const username_tokens = [
TT.DOT, TT.DOT,
@ -116,6 +120,8 @@ function matrixLinkify(linkify) {
S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID); S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:`
S_USERID_COLON.on(TT.NUM, S_USERID); // but do accept :NUM (port specifier)
const GROUPID = function(value) { const GROUPID = function(value) {
@ -131,6 +137,7 @@ function matrixLinkify(linkify) {
const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
const S_GROUPID = new linkify.parser.State(GROUPID); const S_GROUPID = new linkify.parser.State(GROUPID);
const S_GROUPID_COLON = new linkify.parser.State();
const groupid_tokens = [ const groupid_tokens = [
TT.DOT, TT.DOT,
@ -160,6 +167,8 @@ function matrixLinkify(linkify) {
S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID); S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID);
S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:`
S_GROUPID_COLON.on(TT.NUM, S_GROUPID); // but do accept :NUM (port specifier)
} }
// stubs, overwritten in MatrixChat's componentDidMount // stubs, overwritten in MatrixChat's componentDidMount