Use a better regex to identify URLs

2 files changed, 9 insertions, 3 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