From a2d3672fa8daec7de5c720f995461b6f14e6e783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lera=20Elvo=C3=A9?= <yagich@poto.cafe>
Date: Mon, 26 May 2025 00:29:15 +0300
Subject: [PATCH] properly handle url= tags

---
 lib/babycode.lua               | 15 +++++++++++----
 views/common/bbcode_help.etlua |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/babycode.lua b/lib/babycode.lua
index 7d4e8ef..301102b 100644
--- a/lib/babycode.lua
+++ b/lib/babycode.lua
@@ -23,15 +23,17 @@ function babycode.to_html(s, escape_html)
     end
   end)
 
+  local url_tags = {}
   -- replace `[url=https://example.com]Example[/url] tags
   text = text:gsub("%[url=([^%]]+)%](.-)%[/url%]", function(url, label)
-    return '<a href="'..url..'">'..label..'</a>'
+    table.insert(url_tags, {url = url, label = label})
+    return "\1URL:"..#url_tags.."\1"
   end)
   
   -- replace `[url]https://example.com[/url] tags
-  text = text:gsub("%[url%]([^%]]+)%[/url%]", function(url)
-    return '<a href="'..url..'">'..url..'</a>'
-  end)
+  -- text = text:gsub("%[url%]([^%]]+)%[/url%]", function(url)
+  --   return '<a href="'..url..'">'..url..'</a>'
+  -- end)
 
   -- bold, italics, strikethrough
   text = text:gsub("%[b%](.-)%[/b%]", "<strong>%1</strong>")
@@ -48,6 +50,11 @@ function babycode.to_html(s, escape_html)
     return url
   end)
 
+  text = text:gsub("\1URL:(%d+)\1", function(n)
+    local url = url_tags[tonumber(n)]
+    return ("<a href=%s>%s</a>"):format(url.url, url.label)
+  end)
+
   -- rule
   text = text:gsub("\n+%-%-%-", "<hr>")
   
diff --git a/views/common/bbcode_help.etlua b/views/common/bbcode_help.etlua
index b3bc808..e934c67 100644
--- a/views/common/bbcode_help.etlua
+++ b/views/common/bbcode_help.etlua
@@ -1,11 +1,11 @@
 <details>
   <summary>babycode guide</summary>
   <ul>
+    <li>Loose links will be converted to clickable links automatically</li>
     <li>[b]<b>bold</b>[/b]</li>
     <li>[i]<i>italic</i>[/i]</li>
     <li>[s]<del>strikethrough</del>[/s]</li>
     <li>[url=https://example.com]<a href="https://example.com">labeled URL</a>[/url]</li>
-    <li>[url]<a href="https://unlabeled-url.example.com">https://unlabeled-url.example.com</a>[/url]</li>
     <li>
       [code]with<br>line breaks[/code] will produce a code block:
       <details>