From 4bee4818cfe37a32cf2fe3bc0db851dcc2713716 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 17 Oct 2021 21:27:05 -0400
Subject: [PATCH] Add conditional block output for BBCode tag [style]

- Move new line conversion to <br> tags
- Update BBCode help page
---
 doc/BBCode.md               |  8 +++++++-
 doc/de/BBCode.md            |  8 +++++++-
 src/Content/Text/BBCode.php | 10 ++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/doc/BBCode.md b/doc/BBCode.md
index 753bc6942..d23225658 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -644,11 +644,17 @@ On Mastodon this field is used for the content warning.
   </td>
   <td>;-) :-O</td>
 </tr>
+<tr>
+  <td>Custom block styles<br>
+<br>
+[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]</td>
+  <td><div style="text-shadow: 0 0 4px #cc0000;;">You can change all the CSS properties of this block.</div></td>
+</tr>
 <tr>
   <td>Custom inline styles<br>
 <br>
 [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>You can change all <span style="text-shadow: 0 0 4px #cc0000;;">the CSS properties of this inline text.</span></td>
 </tr>
 <tr>
   <td>Custom class block<br>
diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md
index ded52cdb7..7af0861a7 100644
--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@@ -603,11 +603,17 @@ Dieses Feld wird von Mastodon f&uuml;r die Inhaltswarnung (content warning) verw
   </td>
   <td>;-) :-O</td>
 </tr>
+<tr>
+  <td>Benutzerdefinierte Block-Styles<br>
+<br>
+[style=text-shadow: 0 0 4px #CC0000;]Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern-[/style]</td>
+  <td><div style="text-shadow: 0 0 4px #cc0000;;">Du kannst alle CSS-Eigenschaften eines Blocks &auml;ndern.</div></td>
+</tr>
 <tr>
   <td>Benutzerdefinierte Inline-Styles<br>
 <br>
 [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>Du kannst alle <span style="text-shadow: 0 0 4px #cc0000;;">CSS-Eigenschaften dieses Inline-Textes &auml;ndern-</span></td>
 </tr>
 <tr>
   <td>Benutzerdefinierte CSS Klassen<br>
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 7328328e2..76bb9bb3f 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1560,9 +1560,6 @@ class BBCode
 					$text = self::convertAttachment($text, $simple_html, $try_oembed, [], $uriid);
 				}
 
-				// Add HTML new lines
-				$text = str_replace("\n", '<br>', $text);
-
 				$nosmile = strpos($text, '[nosmile]') !== false;
 				$text = str_replace('[nosmile]', '', $text);
 
@@ -1645,11 +1642,16 @@ class BBCode
 				// Check for list text
 				$text = str_replace("[*]", "<li>", $text);
 
-				// Check for style sheet commands
+				// Check for block-level custom CSS
+				$text = preg_replace('#(?<=^|\n)\[style=(.*?)](.*?)\[/style](?:\n|$)#ism', '<div style="$1">$2</div>', $text);
+
+				// Check for inline custom CSS
 				$text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism", '<span style="$1">$2</span>', $text);
 
 				// Check for CSS classes
 				$text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism", '<span class="$1">$2</span>', $text);
+				// Add HTML new lines
+				$text = str_replace("\n", '<br>', $text);
 
 				// handle nested lists
 				$endlessloop = 0;