brianhansonxyz/rspade_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linkify double-escaping URLs with protocols

Browse Source 
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
root
2026-01-28 18:56:04 +00:00
parent ed9bf6f23c
commit 90efeab7ea
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/RSpade/Core/Js/functions.js
View File

@@ -532,13 +532,24 @@ function _linkify_content(content, new_window) {
return '<a href="' + url + '"' + target + '>' + url + '</a>' + trailing; return '<a href="' + url + '"' + target + '>' + url + '</a>' + trailing;
}); });
// Then, replace domain-like text (but not if already inside an href) // Then, replace domain-like text only in segments NOT inside <a> tags
content = content.replace(domain_pattern, (match) => { // (the URL replacement above may have created <a> tags)
// Clean trailing punctuation const link_pattern = /(<a\s[^>]*>.*?<\/a>)/gi;
const domain = match.replace(/[.,;:!?)'\"]+$/, ''); const segments = content.split(link_pattern);
const trailing = match.slice(domain.length);
return '<a href="https://' + domain + '"' + target + '>' + domain + '</a>' + trailing; content = segments.map(segment => {
}); // Skip segments that are already links
if (/^<a\s/i.test(segment)) {
return segment;
}
// Apply domain pattern to non-link segments
return segment.replace(domain_pattern, (match) => {
// Clean trailing punctuation
const domain = match.replace(/[.,;:!?)'\"]+$/, '');
const trailing = match.slice(domain.length);
return '<a href="https://' + domain + '"' + target + '>' + domain + '</a>' + trailing;
});
}).join('');
return content; return content;
} }

30
app/RSpade/helpers.php
View File

@@ -1659,14 +1659,26 @@ function _linkify_content(string $content, bool $new_window): string
return '<a href="' . $url . '"' . $target . '>' . $url . '</a>'; return '<a href="' . $url . '"' . $target . '>' . $url . '</a>';
}, $content); }, $content);
// Then, replace domain-like text (but not if already inside an href) // Then, replace domain-like text only in segments NOT inside <a> tags
$content = preg_replace_callback($domain_pattern, function ($matches) use ($target) { // (the URL replacement above may have created <a> tags)
$domain = $matches[1]; $link_pattern = '/(<a\s[^>]*>.*?<\/a>)/is';
// Clean trailing punctuation $segments = preg_split($link_pattern, $content, -1, PREG_SPLIT_DELIM_CAPTURE);
$domain = rtrim($domain, '.,;:!?)\'\"');
// Don't linkify if it looks like it's already in an href attribute
return '<a href="https://' . $domain . '"' . $target . '>' . $domain . '</a>';
}, $content);
return $content; $result = '';
foreach ($segments as $segment) {
// Skip segments that are already links
if (preg_match('/^<a\s/i', $segment)) {
$result .= $segment;
} else {
// Apply domain pattern to non-link segments
$result .= preg_replace_callback($domain_pattern, function ($matches) use ($target) {
$domain = $matches[1];
// Clean trailing punctuation
$domain = rtrim($domain, '.,;:!?)\'\"');
return '<a href="https://' . $domain . '"' . $target . '>' . $domain . '</a>';
}, $segment);
}
}
return $result;
} }