Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0/autolinker fixes #8368

Merged
merged 3 commits into from
Dec 23, 2024
Merged

3.0/autolinker fixes #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f7069e
Don't change the length of strings while detecting URLs
Sesquipedalian Dec 23, 2024
f443f8b
Fixes a couple of bugs when autolinking in the editor
Sesquipedalian Dec 23, 2024
91b8291
Fixes autolinker's detection of URLs containing square brackets
Sesquipedalian Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Sources/Autolinker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,11 @@ public function detectUrls(string $string, bool $plaintext_only = false): array

// An entity right after the URL can break the autolinker.
$this->setEntitiesRegex();
$string = preg_replace('~(' . $this->entities_regex . ')*(?=\s|$)~u', ' ', $string);
$string = preg_replace_callback(
'~(' . $this->entities_regex . ')*(?=\s|$)~u',
fn ($matches) => str_repeat(' ', strlen($matches[0])),
$string,
);

$this->setUrlRegex();

Expand Down Expand Up @@ -412,7 +416,7 @@ public function detectUrls(string $string, bool $plaintext_only = false): array

// Overwrite all BBC markup elements.
$string = preg_replace_callback(
'/\[[^\]]*\]/i' . ($this->encoding === 'UTF-8' ? 'u' : ''),
'~\[/?' . Parser::getBBCodeTagsRegex() . '[^\]]*\]~i' . ($this->encoding === 'UTF-8' ? 'u' : ''),
fn ($matches) => str_repeat(' ', strlen($matches[0])),
$string,
);
Expand Down Expand Up @@ -786,7 +790,7 @@ public static function createJavaScriptFile(bool $force = false): void
$regexes['email'] = self::load()->getJavaScriptEmailRegex();

// Don't autolink if the URL is inside a Markdown link construct.
$md_lookbehind = !empty(Config::$modSettings['enableMarkdown']) ? '(?<!\[[^\]]*\](?:\(|:[ \t\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000]*\n?[ \t\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000]*))' : '';
$md_lookbehind = !empty(Config::$modSettings['enableMarkdown']) ? '(?<!\[[^\]]*\](?:\(|:[ \t\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000]*\n?[ \t\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000]*)|\[i?url(?:=[^\]]*)?\])' : '(?<!\[i?url(?:=[^\]]*)?\])';

foreach ($regexes as $key => $value) {
$js[] = 'autolinker_regexes.set(' . Utils::escapeJavaScript($key) . ', new RegExp(' . Utils::escapeJavaScript($md_lookbehind . $value) . ', "giu"));';
Expand Down
10 changes: 10 additions & 0 deletions Sources/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,16 @@ public static function getSigTags(): array
return BBcodeParser::getSigTags();
}

/**
* Gets a regular expression to match all known BBC tags.
*
* @return string Regular expression to match all BBCode tags.
*/
public static function getBBCodeTagsRegex(): string
{
return BBcodeParser::load()->getAllTagsRegex();
}

/**
* Highlight any code.
*
Expand Down
4 changes: 2 additions & 2 deletions Themes/default/scripts/jquery.sceditor.smf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,8 @@
url[0] = '//' + url[0];
}

// Wrap the URL in BBC tags.
editor.insert('[' + bbc_tag + '="' + url[0] + '"]', '[/' + bbc_tag + ']');
// Insert the URL.
editor.wysiwygEditorInsertHtml('<a data-type="' + bbc_tag + '" href="' + url[0] + '">' + url[0] + '</a>');
}

// Helper for this.signalKeydownEvent.
Expand Down
Loading