keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10889 from MrPetovan/task/10886-bbcode-remove-class

Browse source 
Deprecate limited-use and potentially confusing [class] BBCode tag
This commit is contained in:
Michael Vogel 2021-10-18 19:28:07 +02:00 committed by GitHub
commit 1dc613a0a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/BBCode.md
View file

@ -650,10 +650,4 @@ On Mastodon this field is used for the content warning.
[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]</td> [style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]</td>
<td><span style="text-shadow: 0 0 4px #cc0000;;">You can change all the CSS properties of this block.</span></td> <td><span style="text-shadow: 0 0 4px #cc0000;;">You can change all the CSS properties of this block.</span></td>
</tr> </tr>
<tr>
<td>Custom class block<br>
<br>
[class=custom]If the class exists, this block will have the custom class style applied.[/class]</td>
<td><pre>&lt;span class="custom"&gt;If the class exists,<br> this block will have the custom class<br> style applied.&lt;/span&gt;</pre></td>
</tr>
</table> </table>

8
doc/de/BBCode.md
View file

@ -609,13 +609,5 @@ Dieses Feld wird von Mastodon f&uuml;r die Inhaltswarnung (content warning) verw
[style=text-shadow: 0 0 4px #CC0000;]Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern-[/style]</td> [style=text-shadow: 0 0 4px #CC0000;]Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern-[/style]</td>
<td><span style="text-shadow: 0 0 4px #cc0000;;">Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern-</span></td> <td><span style="text-shadow: 0 0 4px #cc0000;;">Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern-</span></td>
</tr> </tr>
<tr>
<td>Benutzerdefinierte CSS Klassen<br>
<br>
[class=custom]Wenn die vergebene Klasse in den CSS Anweisungen existiert, wird sie angewandt.[/class]</td>
<td><pre>&lt;span class="custom"&gt;Wenn die<br>
vergebene Klasse in den CSS Anweisungen<br>
existiert,wird sie angewandt.&lt;/span&gt;</pre></td>
</tr>
</table> </table>

4
src/Content/Text/BBCode.php
View file

@ -1648,7 +1648,11 @@ class BBCode
// Check for style sheet commands // Check for style sheet commands
$text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism", '<span style="$1">$2</span>', $text); $text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism", '<span style="$1">$2</span>', $text);
// Mastodon Emoji (internal tag, do not document for users)
$text = preg_replace("(\[emoji=(.*?)](.*?)\[/emoji])ism", '<span class="mastodon emoji"><img src="$1" alt="$2" title="$2"/></span>', $text);
// Check for CSS classes // Check for CSS classes
// @deprecated since 2021.12, left for backward-compatibility reasons
$text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism", '<span class="$1">$2</span>', $text); $text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism", '<span class="$1">$2</span>', $text);
// handle nested lists // handle nested lists

2
src/Protocol/ActivityPub/Processor.php
View file

@ -96,7 +96,7 @@ class Processor
array_combine( array_combine(
array_column($emojis, 'name'), array_column($emojis, 'name'),
array_map(function ($emoji) { array_map(function ($emoji) {
return '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]'; return '[emoji=' . $emoji['href'] . ']' . $emoji['name'] . '[/emoji]';
}, $emojis) }, $emojis)
) )
); );

4
tests/src/Content/Text/BBCodeTest.php
View file

@ -292,6 +292,10 @@ Karl Marx - Die ursprüngliche Akkumulation
'try_oembed' => false, 'try_oembed' => false,
'simpleHtml' => BBCode::TWITTER, 'simpleHtml' => BBCode::TWITTER,
], ],
'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]',
]
]; ];
} }