From c9a41330134375abdcab143a366acc26464e3ea4 Mon Sep 17 00:00:00 2001
From: AlphaX-Qortal <olaf.wasilewski@gmx.de>
Date: Wed, 5 Feb 2025 09:46:26 +0100
Subject: [PATCH] Fix message decoding

---
 crypto/api/deps/Base64Message.js              | 19 ++++++++++---------
 .../components/webworkerDecodeMessages.js     | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/crypto/api/deps/Base64Message.js b/crypto/api/deps/Base64Message.js
index 09d4a509..bdd3501e 100644
--- a/crypto/api/deps/Base64Message.js
+++ b/crypto/api/deps/Base64Message.js
@@ -54,15 +54,16 @@ Base64Message.decode = function (string, keys, ref) {
 		}
 
 		if (responseData.hasOwnProperty('message') && typeof responseData['message'] === 'string' && responseData['message'].length) {
-			const messageStrRaw = responseData.message
-			const messageJoin1 = messageStrRaw.split('"').join('<upvote>')
-			const messageReplace1 = messageJoin1.replace('<p>', '')
-			const messageReplace2 = messageReplace1.replace('</p>', '')
-			const messageTrim = messageReplace2.trim()
-			const messageJoin2 = messageTrim.split('<br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageJoin3 = messageJoin2.split('<br>').join('"},{"type":"hardBreak"},{"type":"text","text":"')
-
-			messageStr = messageJoin3
+			const messageRep = responseData.message
+			const messageRep1 = messageRep.split('"').join('<upvote>')
+			const messageRep2 = messageRep1.replace('<p>', '')
+			const messageRep3 = messageRep2.replace('<br></p>', '')
+			const messageRep4 = messageRep3.replace('</p>', '')
+			const messageRep5 = messageRep4.trim()
+			const messageRep6 = messageRep5.split('<br><br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
+			const messageRep7 = messageRep6.split('<br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
+			const messageRep8 = messageRep7.split('<br>').join('"},{"type":"hardBreak"},{"type":"text","text":"')
+			messageStr = messageRep8
 		}
 
 		if (responseData.repliedTo) {
diff --git a/plugins/plugins/core/components/webworkerDecodeMessages.js b/plugins/plugins/core/components/webworkerDecodeMessages.js
index a9fbef4b..0d0a6923 100644
--- a/plugins/plugins/core/components/webworkerDecodeMessages.js
+++ b/plugins/plugins/core/components/webworkerDecodeMessages.js
@@ -2810,15 +2810,16 @@ const decode = (string, keys, ref) => {
 		}
 
 		if (responseData.hasOwnProperty('message') && typeof responseData['message'] === 'string' && responseData['message'].length) {
-			const messageStrRaw = responseData.message
-			const messageJoin1 = messageStrRaw.split('"').join('<upvote>')
-			const messageReplace1 = messageJoin1.replace('<p>', '')
-			const messageReplace2 = messageReplace1.replace('</p>', '')
-			const messageTrim = messageReplace2.trim()
-			const messageJoin2 = messageTrim.split('<br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageJoin3 = messageJoin2.split('<br>').join('"},{"type":"hardBreak"},{"type":"text","text":"')
-
-			messageStr = messageJoin3
+			const messageRep = responseData.message
+			const messageRep1 = messageRep.split('"').join('<upvote>')
+			const messageRep2 = messageRep1.replace('<p>', '')
+			const messageRep3 = messageRep2.replace('<br></p>', '')
+			const messageRep4 = messageRep3.replace('</p>', '')
+			const messageRep5 = messageRep4.trim()
+			const messageRep6 = messageRep5.split('<br><br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
+			const messageRep7 = messageRep6.split('<br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
+			const messageRep8 = messageRep7.split('<br>').join('"},{"type":"hardBreak"},{"type":"text","text":"')
+			messageStr = messageRep8
 		}
 
 		if (responseData.repliedTo) {