feat: use Parser::bbc on status body content

MissAllSunday · Jun 25, 2024 · 7f1048b · 7f1048b
1 parent 705ff42
commit 7f1048b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Sources/Breeze/Breeze.php b/Sources/Breeze/Breeze.php
@@ -38,7 +38,7 @@ class Breeze
 	public const SUPPORT_URL = 'https://missallsunday.com';
 	public const REACT_DOM_VERSION = '18.2.0';
 	public const REACT_VERSION = '18.2.0';
-	public const REACT_HASH = '3a76fca2';
+	public const REACT_HASH = '158501c6';
 	public const ACTIONS = [
 		'breezeStatus',
 		'breezeComment',

diff --git a/Sources/Breeze/Model/StatusModel.php b/Sources/Breeze/Model/StatusModel.php
@@ -6,6 +6,7 @@
 
 use Breeze\Entity\LikeEntity;
 use Breeze\Entity\StatusEntity as StatusEntity;
+use Breeze\Util\Parser;
 
 class StatusModel extends BaseModel implements StatusModelInterface
 {
@@ -99,6 +100,7 @@ private function prepareData(object $request): array
 			$status[$row[StatusEntity::ID]] = array_map(function ($column) {
 				return ctype_digit($column) ? ( (int) $column) : $column;
 			}, $row);
+			$status[$row[StatusEntity::ID]][StatusEntity::BODY] = Parser::bbc($row[StatusEntity::BODY]);
 
 			$usersIds[] = $row[StatusEntity::WALL_ID];
 			$usersIds[] = $row[StatusEntity::USER_ID];

diff --git a/Sources/Breeze/Util/Parser.php b/Sources/Breeze/Util/Parser.php
@@ -7,7 +7,7 @@
 
 class Parser
 {
-	public static function parse(string $content): string
+	public static function bbc(string $content): string
 	{
 		return parse_bbc($content);
 	}

diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
@@ -20,7 +20,7 @@ const Editor: React.FunctionComponent<any> = (props: { saveContent: (content: st
       smfVars.smfEditorHandler.instance(textArea.current).createPermanentDropDown();
     }
 
-    if (smfVars.editorIsRich) {
+    if (!smfVars.editorIsRich) {
       smfVars.smfEditorHandler.instance(textArea.current).toggleSourceMode();
     }
   }, [props.isFull, textArea]);

diff --git a/src/components/Status.tsx b/src/components/Status.tsx
@@ -93,9 +93,7 @@ function Status(props: StatusProps): React.ReactElement {
         <UserInfo userData={props.status.userData} />
       </div>
       <div className="windowbg floatright">
-        <div className="content" title={timeStamp.toLocaleString()}>
-          {props.status.body}
-        </div>
+        <div className="content" title={timeStamp.toLocaleString()} dangerouslySetInnerHTML={{ __html: props.status.body }} />
         <div className="half_content">
           { permissions.isEnable.enableLikes && permissions.Forum.likesLike && <Like
             item={props.status.likesInfo}