From 2d11d6dcc03b75ee117a57beb05cc18887419e39 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 23 Jun 2018 19:28:48 +0100 Subject: [PATCH] accept repeated TLDs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/linkify-matrix.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index d72319948a..e36450b07f 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -70,6 +70,8 @@ function matrixLinkify(linkify) { S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN); 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) + const USERID = function(value) { MultiToken.call(this, value); @@ -111,6 +113,8 @@ function matrixLinkify(linkify) { S_AT_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN); 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) + const GROUPID = function(value) { MultiToken.call(this, value); @@ -151,6 +155,8 @@ function matrixLinkify(linkify) { S_PLUS_NAME_COLON_DOMAIN.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN); 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) } // stubs, overwritten in MatrixChat's componentDidMount