Various updates

- Add display private messages from Qortal-Hub
- Re-add accidentally deleted qortal request SAVE_FILE
- Reworked decoding Qortal-Hub messages
- Update languages files

plugins/plugins/core/components/ChatScroller.js

@@ -1081,17 +1081,22 @@ class MessageTemplate extends LitElement {
 		let version = 0
 		let isForwarded = false
 		let isEdited = false
-		let isFromHub = false
+		let isEncrypted = false
 
 		try {
 			const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage)
 
-			if (+parsedMessageObj.version > 1 && parsedMessageObj.messageText) {
+			if (parsedMessageObj.version > 1 && parsedMessageObj.messageText) {
 				messageVersion2 = generateHTML(parsedMessageObj.messageText, [StarterKit, Underline, Highlight, Mention])
 				messageVersion2WithLink = processText(messageVersion2)
 			}
 
-			message = parsedMessageObj.messageText
+			if (parsedMessageObj.version > 1 && parsedMessageObj.message) {
+				messageVersion2 = parsedMessageObj.message
+				messageVersion2WithLink = processText(messageVersion2)
+			}
+
+			message = parsedMessageObj.messageText ? parsedMessageObj.messageText : parsedMessageObj.message
 			repliedToData = this.messageObj.repliedToData
 			isImageDeleted = parsedMessageObj.isImageDeleted
 			isGifDeleted = parsedMessageObj.isGifDeleted
@@ -1101,7 +1106,7 @@ class MessageTemplate extends LitElement {
 			version = parsedMessageObj.version
 			isForwarded = parsedMessageObj.type === 'forward'
 			isEdited = parsedMessageObj.isEdited && true
-			isFromHub = parsedMessageObj.isFromHub && true
+			isEncrypted = parsedMessageObj.isFromHub || parsedMessageObj.message ? true : false
 
 			if (parsedMessageObj.images && Array.isArray(parsedMessageObj.images) && parsedMessageObj.images.length > 0) {
 				image = parsedMessageObj.images[0]
@@ -1133,8 +1138,8 @@ class MessageTemplate extends LitElement {
 		let hideit = hidemsg.includes(this.messageObj.sender)
 		let forwarded = ''
 		let edited = ''
-		let fromHubOk = ''
-		let fromHubNo = ''
+		let encrypted = ''
+		let decrypted = ''
 
 		levelFounder = html`<level-founder checkleveladdress="${this.messageObj.sender}"></level-founder>`
 
@@ -1250,9 +1255,9 @@ class MessageTemplate extends LitElement {
 			</span>
 		`
 
-		fromHubOk = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key</mwc-icon>&nbsp;&nbsp;&nbsp;`
+		encrypted = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key</mwc-icon>&nbsp;&nbsp;&nbsp;`
 
-		fromHubNo = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key_off</mwc-icon>&nbsp;&nbsp;&nbsp;`
+		decrypted = html`&nbsp;&nbsp;&nbsp;<mwc-icon style="font-size:16px; color: var(--chat-group);">key_off</mwc-icon>&nbsp;&nbsp;&nbsp;`
 
 		if (repliedToData) {
 			try {
@@ -1672,7 +1677,7 @@ class MessageTemplate extends LitElement {
 											` : this.isAgo ? html`
 												<div style="display: flex; align-items: center;">
 													<div style="margin-top: 4px;">
-														${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
+														${isEncrypted ? html`${encrypted}` : html`${decrypted}`}
 													</div>
 													<div id="timeformat">
 														<span>
@@ -1683,7 +1688,7 @@ class MessageTemplate extends LitElement {
 											` : this.isIso ? html`
 												<div style="display: flex; align-items: center;">
 													<div style="margin-top: 4px;">
-														${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
+														${isEncrypted ? html`${encrypted}` : html`${decrypted}`}
 													</div>
 													<div id="timeformat">
 														<span>
@@ -1694,7 +1699,7 @@ class MessageTemplate extends LitElement {
 											` : this.isBoth ? html`
 												<div style="display: flex; align-items: center;">
 													<div style="margin-top: 4px;">
-														${isFromHub ? html`${fromHubOk}` : html`${fromHubNo}`}
+														${isEncrypted ? html`${encrypted}` : html`${decrypted}`}
 													</div>
 													<div id="timeformat">
 														<span>

plugins/plugins/core/components/plugins-css.js

@@ -2014,8 +2014,13 @@ export const chatStyles = css`
     }
 
     #messageContent code {
-        background-color: rgba(#616161, 0.1);
-        color: #616161;
+        background: #0D0D0D;
+        color: #FFF;
+        font-family: 'JetBrainsMono', monospace;
+        padding: 0.75rem 1rem;
+        border-radius: 0.5rem;
+        white-space: pre-wrap;
+        margin-top: 10px;
     }
 
     #messageContent pre {
@@ -2034,12 +2039,10 @@ export const chatStyles = css`
         font-size: 0.8rem;
     }
 
-
     #messageContent img {
         width: 1.7em;
         height: 1.5em;
         margin: 0px;
-
     }
 
     #messageContent blockquote {
@@ -2078,8 +2081,13 @@ export const chatStyles = css`
     }
 
     .replied-message code {
-        background-color: rgba(#616161, 0.1);
-        color: #616161;
+        background: #0D0D0D;
+        color: #FFF;
+        font-family: 'JetBrainsMono', monospace;
+        padding: 0.75rem 1rem;
+        border-radius: 0.5rem;
+        white-space: pre-wrap;
+        margin: 0px;
     }
 
     .replied-message pre {

plugins/plugins/core/components/qdn-action-constants.js

@@ -159,15 +159,15 @@ export const embedToString = (embed) => {
 		embedService = embed.service
 		embedName = embed.name
 		embedIdentifier = embed.identifier
-		embedString = ',"images":[{"service":"' + embedService + '","name":"' + embedName + '","identifier":"' + embedIdentifier + '"}],"isImageDeleted":false'
+		embedString = '"images":[{"service":"' + embedService + '","name":"' + embedName + '","identifier":"' + embedIdentifier + '"}],"isImageDeleted":false'
 	} else if (embed.type === "ATTACHMENT") {
 		embedService = embed.service
 		embedName = embed.name
 		embedIdentifier = embed.identifier
 		embedAttachmentName = embed.fileName
-		embedString = ',"attachments":[{"service":"' + embedService + '","name":"' + embedName + '","identifier":"' + embedIdentifier + '","attachmentName":"' + embedAttachmentName + '","attachmentSize":0}],"isAttachmentDeleted":false'
+		embedString = '"attachments":[{"service":"' + embedService + '","name":"' + embedName + '","identifier":"' + embedIdentifier + '","attachmentName":"' + embedAttachmentName + '","attachmentSize":0}],"isAttachmentDeleted":false'
 	} else {
-		embedString = ',"images":[""]'
+		embedString = '"images":[""]'
 	}
 
 	return embedString

plugins/plugins/core/components/webworkerDecodeMessages.js

@@ -2767,6 +2767,15 @@ self.addEventListener('message', async (e) => {
 })
 
 const decode = (string, keys, ref) => {
+	let repliedToStr = ''
+	let hubSpecialId = ''
+	let hubMessageStr = ''
+	let newMessageObject = ''
+	let messageUseEmbed = {}
+	let isHubReaction = false
+	let editStr = false
+	let embedFileStr = '"images":[""]'
+
 	const binaryString = atob(string)
 	const binaryLength = binaryString.length
 	const bytes = new Uint8Array(binaryLength)
@@ -2787,88 +2796,54 @@ const decode = (string, keys, ref) => {
 			return decodedString
 		}
 	} else {
-		let repliedToStr = ''
-		let addedFileStr = ''
-		let messageStr = ''
-		let hubString = ''
-		let messageRep = ''
-		let messageUseEmbed = {}
-
 		const res = decryptSingle(string, keys, false)
 
 		if (res === 'noKey' || res === 'decryptionFailed') {
-			return '{"messageText":{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"This message could not be decrypted"}]}]}' + addedFileStr + ',"repliedTo":"","version":3,"isFromHub":true}'
+			return '{"specialId":"","message":"<p>This message could not be decrypted</p>","repliedTo":"","isEdited":false,"isFromHub":true,"isReaction":false,"version": 3}'
 		}
 
 		const decryptToUnit8Array = base64ToUint8Array(res)
 		const responseData = uint8ArrayToObject(decryptToUnit8Array)
 
 		if (responseData.type === "notification") {
-			const messageStrRaw = responseData.data.message
-			messageStr = messageStrRaw.trim()
+			hubMessageStr = responseData.data.message
 		}
 
 		if (ref !== "noref") {
 			if (responseData.type === "reaction") {
+				isHubReaction = true
 				repliedToStr = ref
-				messageStr = responseData.content
+				hubMessageStr = responseData.content
 			}
 		}
 
-		if (responseData.hasOwnProperty('message') && typeof responseData['message'] === 'string' && responseData['message'].length) {
-			if (responseData.message.includes('qortal://use-embed/')) {
-				const useEmbed1 = extensionToPointer(responseData.message)
-				const useEmbed2 = /<newpointer>(.*?)<\/newpointer>/g.exec(useEmbed1)
-				const useEmbed3 = encodedToChar(useEmbed2[1])
-
-				messageUseEmbed = parseQortalLink(useEmbed3)
-				addedFileStr = embedToString(messageUseEmbed)
-
-				const useEmbed4 = responseData.message.split(useEmbed2[1]).join('')
-
-				if (useEmbed4 === "<p></p>") {
-					messageRep = useEmbed4.split('<p></p>').join('<p>Qortal-Hub embed link</p>')
-				} else {
-					messageRep = useEmbed4
-				}
-			} else {
-				messageRep = responseData.message
-				addedFileStr = ',"images":[""]'
-			}
-
-			const messageRep1 = messageRep.split('"').join('<upvote>')
-			const messageRep2 = messageRep1.split('</p><p></p><p></p><p></p><p>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep3 = messageRep2.split('</p><p></p><p></p><p>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep4 = messageRep3.split('</p><p></p><p>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep5 = messageRep4.replace('</p><p>', '')
-			const messageRep6 = messageRep5.replace('<p></p>', '')
-			const messageRep7 = messageRep6.replace('<p>', '')
-			const messageRep8 = messageRep7.replace('<br></p>', '')
-			const messageRep9 = messageRep8.replace('</p>', '')
-			const messageRep10 = messageRep9.trim()
-			const messageRep11 = messageRep10.split('<br><br><br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep12 = messageRep11.split('<br><br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep13 = messageRep12.split('<br><br>').join('"},{"type":"hardBreak"},{"type":"hardBreak"},{"type":"text","text":"')
-			const messageRep14 = messageRep13.split('<br>').join('"},{"type":"hardBreak"},{"type":"text","text":"')
-			messageStr = messageRep14
+		if (responseData.type === "edit") {
+			editStr = true
 		}
 
 		if (responseData.repliedTo) {
 			repliedToStr = responseData.repliedTo
 		}
 
-		if (responseData.type === "edit") {
-			hubString = '{"messageText":{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"' + messageStr + '"}]}]}' + addedFileStr + ',"repliedTo":"' + repliedToStr + '","version":3,"isEdited":true,"isFromHub":true}'
-		} else if (responseData.type === "reaction") {
-			hubString = '{"messageText":{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"' + messageStr + '"}]}]}' + addedFileStr + ',"repliedTo":"' + repliedToStr + '","version":3,"isReaction":true,"isFromHub":true}'
-		} else {
-			hubString = '{"messageText":{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"' + messageStr + '"}]}]}' + addedFileStr + ',"repliedTo":"' + repliedToStr + '","version":3,"isFromHub":true}'
+		if (responseData.specialId) {
+			hubSpecialId = responseData.specialId
 		}
 
-		const preparedString = hubString.split('<upvote>').join('\\"')
-		const finalString = preparedString.replace(/<\/?[^>]+(>|$)/g, '')
+		if (responseData.message.includes('qortal://use-embed/')) {
+			const useEmbed1 = extensionToPointer(responseData.message)
+			const useEmbed2 = /<newpointer>(.*?)<\/newpointer>/g.exec(useEmbed1)
+			const useEmbed3 = encodedToChar(useEmbed2[1])
 
-		return finalString
+			messageUseEmbed = parseQortalLink(useEmbed3)
+			embedFileStr = embedToString(messageUseEmbed)
+			hubMessageStr = responseData.message.split(useEmbed2[1]).join('')
+		} else {
+			hubMessageStr = responseData.message
+		}
+
+		newMessageObject = '{"specialId":"' + hubSpecialId + '","message":"' + hubMessageStr + '",' + embedFileStr + ',"repliedTo":"' + repliedToStr + '","isEdited":' + editStr + ',"isFromHub":true,"isReaction":' + isHubReaction + ',"version": 3}'
+
+		return newMessageObject
 	}
 }
 

plugins/plugins/core/q-chat/q-chat.src.js

@@ -317,7 +317,7 @@ class Chat extends LitElement {
 				<!-- View Chat Over ID -->
 				<mwc-dialog id="viewChatDialog">
 					<div style="text-align: center;">
-						<h1>Please Enter The Group ID</h1>
+						<h1>${translate("modals.mpchange87")}</h1>
 						<hr>
 						<br>
 					</div>
@@ -326,7 +326,7 @@ class Chat extends LitElement {
 							style="width: 100%;"
 							required
 							id="groupIdInput"
-							label="Emter Group ID"
+							label="${translate("managegroup.mg8")}"
 							type="number"
 							auto-validate="false"
 							value=""

plugins/plugins/core/qdn/browser/browser.src.js

@@ -17,7 +17,7 @@ import {
 } from '../../../utils/classes'
 import {appendBuffer} from '../../../utils/utilities'
 import {QORT_DECIMALS} from '../../../../../crypto/api/constants'
-import {listOfAllQortalRequests} from '../../components/qdn-action-constants'
+import {mimeToExtensionMap, listOfAllQortalRequests} from '../../components/qdn-action-constants'
 import {
 	createSymmetricKeyAndNonce,
 	decryptGroupEncryptionWithSharingKey,
@@ -2252,6 +2252,108 @@ class WebBrowser extends LitElement {
 				}
 					break
 
+				case actions.SAVE_FILE: {
+					try {
+						const requiredFields = ['filename', 'blob']
+						const missingFields = []
+						let dataSentBack = {}
+						requiredFields.forEach((field) => {
+							if (!data[field]) {
+								missingFields.push(field)
+							}
+						})
+						if (missingFields.length > 0) {
+							const missingFieldsString = missingFields.join(', ')
+							const tryAgain = get("walletpage.wchange44")
+							await showErrorAndWait(
+								"MISSING_FIELDS",
+								{
+									id1: missingFieldsString,
+									id2: tryAgain
+								}
+							)
+							dataSentBack['error'] = `Missing fields: ${missingFieldsString}`
+							response = JSON.stringify(dataSentBack)
+							break
+						}
+						const filename = data.filename
+						const blob = data.blob
+						const res = await showModalAndWait(
+							actions.SAVE_FILE,
+							{
+								filename
+							}
+						)
+						if (res.action === 'reject') {
+							let myMsg1 = get("transactions.declined")
+							let myMsg2 = get("walletpage.wchange44")
+							await showErrorAndWait("DECLINED_REQUEST", { id1: myMsg1, id2: myMsg2 })
+							response = '{"error": "User declined request"}'
+							break
+						}
+						const mimeType = blob.type || data.mimeType
+						let backupExention = filename.split('.').pop()
+						if (backupExention) {
+							backupExention = '.' + backupExention
+						}
+						const fileExtension = mimeToExtensionMap[mimeType] || backupExention
+						let fileHandleOptions = {}
+						if (!mimeType) {
+							const obj = {}
+							obj['error'] = 'A mimeType could not be derived'
+							response = JSON.stringify(obj)
+							break
+						}
+						if (!fileExtension) {
+							const obj = {}
+							obj['error'] = 'A file extension could not be derived'
+							response = JSON.stringify(obj)
+							break
+						}
+						if (fileExtension && mimeType) {
+							fileHandleOptions = {
+								accept: {
+									[mimeType]: [fileExtension]
+								}
+							}
+						}
+						try {
+							const fileHandle = await self.showSaveFilePicker({
+								suggestedName: filename,
+								types: [
+									{
+										description: mimeType,
+										...fileHandleOptions
+									}
+								]
+							})
+							const writeFile = async (fileHandle, contents) => {
+								const writable = await fileHandle.createWritable()
+								await writable.write(contents)
+								await writable.close()
+							}
+							writeFile(fileHandle, blob).then(() => console.log("FILE SAVED"))
+						} catch (error) {
+							if (error.name === 'AbortError') {
+								const obj = {}
+								obj['error'] = 'User declined the download'
+								response = JSON.stringify(obj)
+								break
+							}
+							FileSaver.saveAs(blob, filename)
+						}
+						response = JSON.stringify(true)
+					} catch (error) {
+						let myMsg1 = get("managegroup.mg58")
+						let myMsg2 = get("walletpage.wchange44")
+						await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 })
+						const obj = {}
+						obj['error'] = error.message || 'Failed to initiate download'
+						response = JSON.stringify(obj)
+					}
+				}
+					break
+
 				case actions.DEPLOY_AT: {
 					const requiredFields = ['name', 'description', 'tags', 'creationBytes', 'amount', 'assetId', 'type']
 					const missingFields = []