<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
DI::config()->set('system', 'remove_multiplicated_lines', false);
DI::config()->set('system', 'no_oembed', false);
DI::config()->set('system', 'allowed_link_protocols', []);
- DI::config()->set('system', 'url', 'friendica.local');
+ DI::config()->set('system', 'url', 'https://friendica.local');
DI::config()->set('system', 'no_smilies', false);
DI::config()->set('system', 'big_emojis', false);
DI::config()->set('system', 'allowed_oembed', '');
- DI::baseUrl()->save('friendica.local', DI::baseUrl()::SSL_POLICY_FULL, '');
-
$config = \HTMLPurifier_HTML5Config::createDefault();
$config->set('HTML.Doctype', 'HTML5');
$config->set('Attr.AllowedRel', [
{
return [
'bug-7271-condensed-space' => [
- 'expectedHtml' => '<ul class="listdecimal" style="list-style-type:decimal;"><li> <a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
+ 'expectedHtml' => '<ol><li> <a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ol>',
'text' => '[ol][*] http://example.com/[/ol]',
],
'bug-7271-condensed-nospace' => [
- 'expectedHtml' => '<ul class="listdecimal" style="list-style-type:decimal;"><li><a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
+ 'expectedHtml' => '<ol><li><a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ol>',
'text' => '[ol][*]http://example.com/[/ol]',
],
'bug-7271-indented-space' => [
- 'expectedHtml' => '<ul
class="listbullet" style="list-style-type:circle;"><li> <a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
+ 'expectedHtml' => '<ul><li> <a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
'text' => '[ul]
[*] http://example.com/
[/ul]',
],
'bug-7271-indented-nospace' => [
- 'expectedHtml' => '<ul
class="listbullet" style="list-style-type:circle;"><li><a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
+ 'expectedHtml' => '<ul><li><a href="http://example.com/" target="_blank" rel="noopener noreferrer">http://example.com/</a></li></ul>',
'text' => '[ul]
[*]http://example.com/
[/ul]',
'task-10886-deprecate-class' => [
'expectedHTML' => '<span class="mastodon emoji"><img src="https://fedi.underscore.world/emoji/custom/custom/heart_nb.png" alt=":heart_nb:" title=":heart_nb:"></span>',
'text' => '[emoji=https://fedi.underscore.world/emoji/custom/custom/heart_nb.png]:heart_nb:[/emoji]',
- ]
+ ],
+ 'task-12900-multiple-paragraphs' => [
+ 'expectedHTML' => '<h1>Header</h1><ul><li>One</li><li>Two</li></ul><p>This is a paragraph<br>with a line feed.</p><p>Second Chapter</p>',
+ 'text' => "[h1]Header[/h1][ul][*]One[*]Two[/ul]\n\nThis is a paragraph\nwith a line feed.\n\nSecond Chapter",
+ ],
+ 'task-12900-header-with-paragraphs' => [
+ 'expectedHTML' => '<h1>Header</h1><p>Some Chapter</p>',
+ 'text' => '[h1]Header[/h1]Some Chapter',
+ ],
+ 'bug-12842-ul-newlines' => [
+ 'expectedHTML' => '<p>This is:</p><ul><li>some</li><li>amazing</li><li>list</li></ul>',
+ 'text' => "This is:\r\n[ul]\r\n[*]some\r\n[*]amazing\r\n[*]list\r\n[/ul]",
+ ],
+ 'bug-12842-ol-newlines' => [
+ 'expectedHTML' => '<p>This is:</p><ol><li>some</li><li>amazing</li><li>list</li></ol>',
+ 'text' => "This is:\r\n[ol]\r\n[*]some\r\n[*]amazing\r\n[*]list\r\n[/ol]",
+ ],
+ 'task-12917-tabs-between-linebreaks' => [
+ 'expectedHTML' => '<p>Paragraph</p><p>New Paragraph</p>',
+ 'text' => "Paragraph\n\t\nNew Paragraph",
+ ],
];
}
*
* @throws InternalServerErrorException
*/
- public function testConvert(string $expectedHtml, string $text, $try_oembed = false, int $simpleHtml = 0, bool $forPlaintext = false)
+ public function testConvert(string $expectedHtml, string $text, bool $try_oembed = true, int $simpleHtml = BBCode::INTERNAL, bool $forPlaintext = false)
{
+ // This assumes system.remove_multiplicated_lines = false
$actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext);
self::assertEquals($expectedHtml, $actual);
'expected' => '&`&`',
'text' => '&[code]&[/code]',
],
+ 'bug-12701-quotes' => [
+ 'expected' => '[](https://domain.tld/photos/user/image/86912721086415cdc8e0a03226831581)',
+ 'text' => '[url=https://domain.tld/photos/user/image/86912721086415cdc8e0a03226831581][img=https://domain.tld/photo/86912721086415cdc8e0a03226831581-1.png]abc"fgh[/img][/url]'
+ ],
+ 'bug-12701-no-quotes' => [
+ 'expected' => '[](https://domain.tld/photos/user/image/86912721086415cdc8e0a03226831581)',
+ 'text' => '[url=https://domain.tld/photos/user/image/86912721086415cdc8e0a03226831581][img=https://domain.tld/photo/86912721086415cdc8e0a03226831581-1.png]abcfgh[/img][/url]'
+ ],
];
}
*
* @throws InternalServerErrorException
*/
- public function testToMarkdown(string $expected, string $text, $for_diaspora = false)
+ public function testToMarkdown(string $expected, string $text, $for_diaspora = true)
{
$actual = BBCode::toMarkdown($text, $for_diaspora);
'empty-tag' => [
'expected' => [
'author' => '',
- 'profile' => '',
- 'avatar' => '',
- 'link' => '',
- 'posted' => '',
- 'guid' => '',
- 'comment' => '',
- 'shared' => '',
+ 'profile' => '',
+ 'avatar' => '',
+ 'link' => '',
+ 'posted' => '',
+ 'guid' => '',
+ 'message_id' => '',
+ 'comment' => '',
+ 'shared' => '',
],
'text' => '[share][/share]',
],
'link' => '',
'posted' => '',
'guid' => '',
+ 'message_id' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'comment' => 'comment',
- 'shared' => 'shared',
+ 'shared' => '',
],
'text' => ' comment
- [share]
- shared
- [/share]',
+ [share]https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243[/share]',
],
'all-attributes' => [
'expected' => [
'link' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'posted' => '2022-06-16 12:34:10',
'guid' => '735a2029-1062-ab23-42e4-f9c631220243',
+ 'message_id' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'comment' => '',
'shared' => 'George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.',
],
'text' => "[share
- author='Hypolite Petovan'
- profile='https://friendica.mrpetovan.com/profile/hypolite'
- avatar='https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png'
- link='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
- posted='2022-06-16 12:34:10'
- guid='735a2029-1062-ab23-42e4-f9c631220243'
- ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
+ author='Hypolite Petovan'
+ profile='https://friendica.mrpetovan.com/profile/hypolite'
+ avatar='https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png'
+ link='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
+ posted='2022-06-16 12:34:10'
+ guid='735a2029-1062-ab23-42e4-f9c631220243'
+ message_id='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
+ ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.[/share]",
],
'link' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'posted' => '2022-06-16 12:34:10',
'guid' => '',
+ 'message_id' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'comment' => '',
'shared' => 'George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.',
],
'text' => "[share
- author='Hypolite Petovan'
- profile='https://friendica.mrpetovan.com/profile/hypolite'
- avatar='https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png'
- link='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
- posted='2022-06-16 12:34:10'
- ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
+ author='Hypolite Petovan'
+ profile='https://friendica.mrpetovan.com/profile/hypolite'
+ avatar='https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png'
+ link='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
+ posted='2022-06-16 12:34:10'
+ message_id='https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243'
+ ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.[/share]",
],
'link' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'posted' => '2022-06-16 12:34:10',
'guid' => '',
+ 'message_id' => 'https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243',
'comment' => '',
'shared' => 'George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.',
],
'text' => '[share
- author="Hypolite Petovan"
- profile="https://friendica.mrpetovan.com/profile/hypolite"
- avatar="https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png"
- link="https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243"
- posted="2022-06-16 12:34:10"
- ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
+ author="Hypolite Petovan"
+ profile="https://friendica.mrpetovan.com/profile/hypolite"
+ avatar="https://friendica.mrpetovan.com/photo/20682437145daa4e85f019a278584494-5.png"
+ link="https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243"
+ message_id="https://friendica.mrpetovan.com/display/735a2029-1062-ab23-42e4-f9c631220243"
+ posted="2022-06-16 12:34:10"
+ ]George Lucas: I made a science-fiction universe with a straightforward anti-authoritarianism plot where even the libertarian joins the rebellion.
Disney: So a morally grey “choose your side” story, right?
Lucas: For the right price, yes.[/share]',
],
projects / friendica.git / blobdiff