Changeset 3738408 for mxchat-basic/trunk/js/chat-script.js

Timestamp:

10/10/2026 05:08:54 PM (3 weeks ago)

Author:

mxchat

Message:

Release 3.2.25 - per-site license on/off, Gemini safety-filter fix, chat styles scoped to the widget, link and PDF-detection fixes, import and Gemini 3 search improvements

File:

• mxchat-basic/trunk/js/chat-script.js (modified) (3 diffs)

mxchat-basic/trunk/js/chat-script.js

@@ -2639 +2639 @@
     // Process standalone URLs - but NOT if they're already in <a> tags or brackets
     // Updated pattern to be more careful about what it matches
-    const urlPattern = /(^|[^">=\[\]])(https?:\/\/[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
+    //
+    // The prefix group (plan 78618d) is the start of a line, an ordinary
+    // character, OR a tag this formatter itself opened or closed (paragraph,
+    // list item, table cell, heading, emphasis, line break), so an address
+    // that opens a paragraph or sits inside **bold** is linked too. Never
+    // an anchor (its text would be linked twice; the lookahead guards that
+    // as well) and never a code span, which stays as typed. No lookbehind,
+    // for Safari.
+    const urlPattern = /(^|[^">=\[\]]|<\/?(?:p|li|td|th|h[1-6]|strong|em|b|i|del|br)(?:\s[^<>]*)?\/?>)(https?:\/\/[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
     processedText = processedText.replace(urlPattern, (match, prefix, url) => {
         // Extra check: make sure this isn't already linked
@@ -2652 +2660 @@
     });
     
-    // Process www. URLs - but NOT if they're already in <a> tags or brackets
-    const wwwPattern = /(^|[^">/\[\]])(www\.[\S]+)(?![^<]*<\/a>)(?!\])/gim;
+    // Process www. URLs - but NOT if they're already in <a> tags or brackets.
+    // The address stops at the same characters the https pattern stops at
+    // (plan 78618d): it used to run through the closing paragraph tag, so
+    // "Try www.example.com/page." linked to www.example.com/page.%3C/p%3E.
+    // Same prefix group as the https pattern, same reasons.
+    const wwwPattern = /(^|[^">/\[\]]|<\/?(?:p|li|td|th|h[1-6]|strong|em|b|i|del|br)(?:\s[^<>]*)?\/?>)(www\.[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
     processedText = processedText.replace(wwwPattern, (match, prefix, url) => {
         // Extra check: make sure this isn't already linked
@@ -2719 +2731 @@
     });
     
-    // Step 1c: Also protect bare URLs that might exist
+    // Step 1c: Also protect bare URLs that might exist. Trailing emphasis
+    // markers are not part of the address (plan 78618d): **https://x.com**
+    // used to protect "https://x.com**", so the bold never paired and the
+    // asterisks ended up inside the link. The markers stay outside the
+    // placeholder so the styling rules below can pair them.
     protectedText = protectedText.replace(/(https?:\/\/[^\s<>"]+)/gi, function(match) {
+        const markers = match.match(/[*_~]+$/);
+        const url = markers ? match.slice(0, match.length - markers[0].length) : match;
         const placeholder = `__PROTECTED_${protectedSegments.length}__`;
-        protectedSegments.push(match);
-        return placeholder;
+        protectedSegments.push(url);
+        return placeholder + (markers ? markers[0] : '');
     });