From c969cd738fcd556fdc94ff4a43edc9a2dddaae07 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 18 Oct 2024 16:04:34 +0200
Subject: [PATCH] Fix note bugs (#306)

---
 .../Components/Credentials/FormattedNote.razor     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor b/src/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
index 3cff88e2b..2822dfa3b 100644
--- a/src/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
+++ b/src/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
@@ -2,7 +2,9 @@
 
 <div class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
     <h3 class="mb-4 text-xl font-semibold dark:text-white">Notes</h3>
-    @((MarkupString)ConvertUrlsToLinks(Notes.Replace(Environment.NewLine, "<br>")))
+    <div class="dark:text-gray-300">
+        @((MarkupString)ConvertUrlsToLinks(Notes).Replace(Environment.NewLine, "<br>"))
+    </div>
 </div>
 
 @code {
@@ -15,6 +17,14 @@
     private static string ConvertUrlsToLinks(string text)
     {
         string urlPattern = @"(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})";
-        return Regex.Replace(text, urlPattern, match => $"<a href=\"{match.Value}\" target=\"_blank\" class=\"text-blue-500 hover:underline\">{match.Value}</a>", RegexOptions.None, TimeSpan.FromMilliseconds(100));
+        return Regex.Replace(text, urlPattern, match =>
+        {
+            string url = match.Value;
+            if (!url.StartsWith("http://") && !url.StartsWith("https://"))
+            {
+                url = "http://" + url;
+            }
+            return $"<a href=\"{url}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-blue-500 hover:underline\">{match.Value}</a>";
+        }, RegexOptions.None, TimeSpan.FromMilliseconds(200));
     }
 }