Update app.py

app.py

@@ -82,48 +82,23 @@ async def generate_audio(text, voice, filename):
 def detect_and_convert_links(text):
     # Convert Markdown links [text](url) to HTML <a> tags
     md_link_pattern = re.compile(r'\[(.*?)\]\((https?://[^\s\[\]()<>{}]+)\)')
-    def replace_md_link(match):
-        text = match.group(1)
-        url = match.group(2)
-        return f'<a href="{url}" color="blue">{text}</a>'
-    text = md_link_pattern.sub(replace_md_link, text)
+    text = md_link_pattern.sub(r'<a href="\2" color="blue">\1</a>', text)
     
     # Convert plain URLs to HTML <a> tags, avoiding already tagged links
     url_pattern = re.compile(
-        r'(?<!href=")(https?://[^\s\[\]()<>{}]+)',
+        r'(?<!href=")(https?://[^\s<>{}]+)',
         re.IGNORECASE
     )
-    def replace_url(match):
-        url = match.group(1)
-        return f'<a href="{url}" color="blue">{url}</a>'
-    
-    text = url_pattern.sub(replace_url, text)
+    text = url_pattern.sub(r'<a href="\1" color="blue">\1</a>', text)
     return text
 
 def apply_emoji_font(text, emoji_font):
-    # Preserve links and bold tags
-    link_pattern = re.compile(r'(<a\s+href="[^"]+"[^>]*>.*?</a>)')
-    bold_pattern = re.compile(r'(<b>.*?</b>)')
-    
-    # Split text around links and bold tags
-    segments = []
-    last_pos = 0
-    for match in link_pattern.finditer(text):
-        start, end = match.span()
-        if last_pos < start:
-            segments.append(('text', text[last_pos:start]))
-        segments.append(('link', match.group(0)))
-        last_pos = end
-    for match in bold_pattern.finditer(text[last_pos:]):
-        start, end = match.span()
-        if last_pos < start + last_pos:
-            segments.append(('text', text[last_pos:start + last_pos]))
-        segments.append(('bold', match.group(0)))
-        last_pos = start + end
-    if last_pos < len(text):
-        segments.append(('text', text[last_pos:]))
+    # Protect existing tags
+    tag_pattern = re.compile(r'(<[^>]+>)')
+    segments = tag_pattern.split(text)
+    result = []
     
-    # Apply emoji font to text segments only
+    # Apply emoji font only to non-tag text
     emoji_pattern = re.compile(
         r"([\U0001F300-\U0001F5FF"
         r"\U0001F600-\U0001F64F"
@@ -144,24 +119,23 @@ def apply_emoji_font(text, emoji_font):
         emoji = unicodedata.normalize('NFC', emoji)
         return f'<font face="{emoji_font}">{emoji}</font>'
     
-    result = []
-    for seg_type, content in segments:
-        if seg_type == 'text':
+    for segment in segments:
+        if tag_pattern.match(segment):
+            # Keep tags unchanged
+            result.append(segment)
+        else:
             # Apply font to non-emoji text and emoji separately
             parts = []
             last_pos = 0
-            for match in emoji_pattern.finditer(content):
+            for match in emoji_pattern.finditer(segment):
                 start, end = match.span()
                 if last_pos < start:
-                    parts.append(f'<font face="DejaVuSans">{content[last_pos:start]}</font>')
+                    parts.append(f'<font face="DejaVuSans">{segment[last_pos:start]}</font>')
                 parts.append(replace_emoji(match))
                 last_pos = end
-            if last_pos < len(content):
-                parts.append(f'<font face="DejaVuSans">{content[last_pos:]}</font>')
+            if last_pos < len(segment):
+                parts.append(f'<font face="DejaVuSans">{segment[last_pos:]}</font>')
             result.append(''.join(parts))
-        else:
-            # Keep links and bold tags unchanged
-            result.append(content)
     
     return ''.join(result)