Use a better regex to identify URLs

4 files changed, 14 insertions, 12 deletions

diff --git a/include/Config.h b/include/Config.h
index 781e910c..805e7c02 100644
--- a/include/Config.h
+++ b/include/Config.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QRegExp>
+#include <QString>
+
 // Non-theme app configuration. Layouts, fonts spacing etc.
 //
 // Font sizes are in pixels.
@@ -16,6 +19,12 @@ namespace dialogs {
 static constexpr int labelSize = 15;
 }
 
+namespace strings {
+static const QString url_html = "<a href=\"\\1\">\\1</a>";
+static const QRegExp url_regex(
+  "((www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]\\)\\:])");
+}
+
 // Window geometry.
 namespace window {
 static constexpr int height = 600;
diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h
index 471662a4..13eaaa38 100644
--- a/include/TopRoomBar.h
+++ b/include/TopRoomBar.h
@@ -36,9 +36,6 @@ class Menu;
 class OverlayModal;
 class RoomSettings;
 
-static const QString URL_HTML = "<a href=\"\\1\">\\1</a>";
-static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
-
 class TopRoomBar : public QWidget
 {
         Q_OBJECT
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index 9ad30064..381702e0 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -216,7 +216,7 @@ TopRoomBar::paintEvent(QPaintEvent *event)
                 elidedText =
                   QFontMetrics(topicLabel_->font())
                     .elidedText(roomTopic_, Qt::ElideRight, topicLabel_->width() - perFrameResize);
-        elidedText.replace(URL_REGEX, URL_HTML);
+        elidedText.replace(conf::strings::url_regex, conf::strings::url_html);
         topicLabel_->setText(elidedText);
 }
 
diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc
index f986a0a6..3ebbbee0 100644
--- a/src/timeline/TimelineItem.cc
+++ b/src/timeline/TimelineItem.cc
@@ -16,7 +16,6 @@
  */
 
 #include <QFontDatabase>
-#include <QRegExp>
 #include <QTextEdit>
 
 #include "Avatar.h"
@@ -28,9 +27,6 @@
 #include "timeline/widgets/ImageItem.h"
 #include "timeline/widgets/VideoItem.h"
 
-static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
-static const QString URL_HTML = "<a href=\"\\1\">\\1</a>";
-
 void
 TimelineItem::init()
 {
@@ -84,7 +80,7 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
         }
 
         body = body.toHtmlEscaped();
-        body.replace(URL_REGEX, URL_HTML);
+        body.replace(conf::strings::url_regex, conf::strings::url_html);
         body.replace("\n", "<br/>");
         generateTimestamp(timestamp);
 
@@ -206,7 +202,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Notice
 
         generateTimestamp(timestamp);
 
-        body.replace(URL_REGEX, URL_HTML);
+        body.replace(conf::strings::url_regex, conf::strings::url_html);
         body.replace("\n", "<br/>");
         body = "<i>" + body + "</i>";
 
@@ -252,7 +248,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Emote>
 
         generateTimestamp(timestamp);
         emoteMsg = emoteMsg.toHtmlEscaped();
-        emoteMsg.replace(URL_REGEX, URL_HTML);
+        emoteMsg.replace(conf::strings::url_regex, conf::strings::url_html);
         emoteMsg.replace("\n", "<br/>");
 
         if (with_sender) {
@@ -295,7 +291,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
         generateTimestamp(timestamp);
 
         body = body.toHtmlEscaped();
-        body.replace(URL_REGEX, URL_HTML);
+        body.replace(conf::strings::url_regex, conf::strings::url_html);
         body.replace("\n", "<br/>");
 
         if (with_sender) {