extract and link hashtags without trailing punctuation

Author: Ameneh-Keshavarz

backend/data/blooms.py

@@ -6,6 +6,8 @@
 from data.connection import db_cursor
 from data.users import User
 
+import re
+
 
 @dataclass
 class Bloom:
@@ -16,7 +18,7 @@ class Bloom:
 
 
 def add_bloom(*, sender: User, content: str) -> Bloom:
-    hashtags = [word[1:] for word in content.split(" ") if word.startswith("#")]
+    hashtags = re.findall(r"#(\w+)", content)
 
     now = datetime.datetime.now(tz=datetime.UTC)
     bloom_id = int(now.timestamp() * 1000000)

front-end/components/bloom.mjs

@@ -37,8 +37,8 @@ const createBloom = (template, bloom) => {
 function _formatHashtags(text) {
   if (!text) return text;
   return text.replace(
-    /\B#[^#]+/g,
-    (match) => `<a href="/hashtag/${match.slice(1)}">${match}</a>`
+    /#([\p{L}0-9_]+)/gu,
+    (_, tag) => `<a href="/hashtag/${encodeURIComponent(tag)}">#${tag}</a>`
   );
 }