From d8484e65bdff720e166f9b230d4b788bea64e7cd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 25 Sep 2019 20:25:42 -0400 Subject: [PATCH] Move autolinker execution earlier in BBCode::convert - Prevents already replaced HTML links (like in [audio] tag) to be doubled - Add test for it --- src/Content/Text/BBCode.php | 7 +++++-- tests/src/Content/Text/BBCodeTest.php | 15 +++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 02c9551027..c5f9986f1f 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1466,6 +1466,11 @@ class BBCode extends BaseObject $text = str_replace('[hr]', '
', $text); + if (!$for_plaintext) { + // Autolinker for isolated URLs + $text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text); + } + // This is actually executed in Item::prepareBody() $nosmile = strpos($text, '[nosmile]') !== false; @@ -1648,9 +1653,7 @@ class BBCode extends BaseObject $text = Smilies::replace($text); } - // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text if (!$for_plaintext) { - $text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text); if (in_array($simple_html, [7, 9])) { $text = preg_replace_callback("/\[url\](.*?)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text); $text = preg_replace_callback("/\[url\=(.*?)\](.*?)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text); diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php index 3d8beb3930..1ff653db91 100644 --- a/tests/src/Content/Text/BBCodeTest.php +++ b/tests/src/Content/Text/BBCodeTest.php @@ -179,41 +179,48 @@ class BBCodeTest extends MockedTest 'bug-2199-named-size' => [ 'expectedHtml' => 'Test text', 'text' => '[size=xx-large]Test text[/size]', - 'simpleHtml' => 0, ], 'bug-2199-numeric-size' => [ 'expectedHtml' => 'Test text', 'text' => '[size=24]Test text[/size]', - 'simpleHtml' => 0, ], 'bug-2199-diaspora-no-named-size' => [ 'expectedHtml' => 'Test text', 'text' => '[size=xx-large]Test text[/size]', + 'try_oembed' => false, // Triggers the diaspora compatible output 'simpleHtml' => 3, ], 'bug-2199-diaspora-no-numeric-size' => [ 'expectedHtml' => 'Test text', 'text' => '[size=24]Test text[/size]', + 'try_oembed' => false, // Triggers the diaspora compatible output 'simpleHtml' => 3, ], + 'bug-7665-audio-tag' => [ + 'expectedHtml' => '', + 'text' => '[audio]http://www.cendrones.fr/colloque2017/jonathanbocquet.mp3[/audio]', + 'try_oembed' => true, + ], ]; } /** * Test convert bbcodes to HTML + * * @dataProvider dataBBCodes * * @param string $expectedHtml Expected HTML output * @param string $text BBCode text + * @param bool $try_oembed Whether to convert multimedia BBCode tag * @param int $simpleHtml BBCode::convert method $simple_html parameter value, optional. * @param bool $forPlaintext BBCode::convert method $for_plaintext parameter value, optional. * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function testConvert($expectedHtml, $text, $simpleHtml = 0, $forPlaintext = false) + public function testConvert($expectedHtml, $text, $try_oembed = false, $simpleHtml = 0, $forPlaintext = false) { - $actual = BBCode::convert($text, false, $simpleHtml, $forPlaintext); + $actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext); $this->assertEquals($expectedHtml, $actual); } -- 2.39.5