don't accept closing parenthesis as last character of url

element-hq · May 12, 2021 · 62bb891 · 62bb891
1 parent 59a74db
commit 62bb891
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/domain/session/room/timeline/linkify/linkify.js b/src/domain/session/room/timeline/linkify/linkify.js
@@ -96,6 +96,12 @@ export function tests() {
             }
         },
 
+        "Link doesn't adopt closing parenthesis": assert => {
+            const link = "(https://matrix.org)";
+            const out = [{ type: "text", text: "(" }, { type: "link", text: "https://matrix.org" }, { type: "text", text: ")" }];
+            test(assert, link, out);
+        },
+
         "Unicode in hostname must not linkify": assert => {
             const link = "https://foo.bar\uD83D\uDE03.com";
             const out = [{ type: "link", text: "https://foo.bar" },

diff --git a/src/domain/session/room/timeline/linkify/regex.js b/src/domain/session/room/timeline/linkify/regex.js
@@ -4,7 +4,7 @@ meaning that any escapes (\) must also
 be escaped.
 */
 const scheme = "(?:https|http|ftp):\\/\\/";
-const noSpaceNorPunctuation = "[^\\s.,?!]";
+const noSpaceNorPunctuation = "[^\\s.,?!)]";
 const hostCharacter = "[a-zA-Z0-9:.\\[\\]-]";
 
 /*