From bd71b075e699ab4dda92d72bac77cbfeb6217625 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 3 Oct 2021 19:43:03 +0200
Subject: prettyPrint(): tighten up Matrix identifier regex

It was too permissive on characters before the identifier and also
allowed the domain name to start on dash, which should not occur.
Closes #512.
---
 lib/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.cpp b/lib/util.cpp
index 3de1d169..8067f561 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -44,7 +44,7 @@ void Quotient::linkifyUrls(QString& htmlEscapedText)
     // https://matrix.org/docs/spec/appendices.html#identifier-grammar
     static const QRegularExpression MxIdRegExp(
         QStringLiteral(
-            R"((^|[^<>/])([!#@][-a-z0-9_=#/.]{1,252}:(?:\w|\.|-)+\.\w+(?::\d{1,5})?))"),
+            R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"),
         RegExpOptions);
     Q_ASSERT(FullUrlRegExp.isValid() && EmailAddressRegExp.isValid()
              && MxIdRegExp.isValid());
-- 
cgit v1.2.3