Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-11 09:45:52 +00:00
Code Issues Projects Releases Wiki Activity

fix reactions from qortal-hub

Browse Source
This commit is contained in:
AlphaX-Qortal 2025-01-17 16:17:30 +01:00
parent 694e4e6f92
commit a696444978
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/plugins/core/components/ChatPage.js
View File

@ -2257,9 +2257,10 @@ class ChatPage extends LitElement {
}
async addToUpdateMessageHashmap(array) {
const withoutHubReactions = array.filter(({decodedMessage}) => !decodedMessage.includes('isReaction'))
const newObj = {}
array.forEach((item) => {
withoutHubReactions.forEach((item) => {
const signature = item.originalSignature || item.signature
newObj[signature] = item
})

40
plugins/plugins/core/q-chat/q-chat.src.js
View File

@ -451,6 +451,7 @@ class Chat extends LitElement {
let currentGroupId = url.substring(6)
let symIdentifier = 'symmetric-qchat-group-' + currentGroupId
let locateString = "Downloading and decrypt keys ! Please wait..."
let keysToOld = "Wait until an admin re-encrypts the keys. Only unencrypted messages will be displayed."
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
@ -502,24 +503,31 @@ class Chat extends LitElement {
data = await res.text()
const decryptedKey = await this.decryptGroupEncryption(data)
const dataint8Array = base64ToUint8Array(decryptedKey.data)
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array)
if (!validateSecretKey(decryptedKeyToObject)) {
throw new Error("SecretKey is not valid")
if (decryptedKey === undefined) {
parentEpml.request('showSnackBar', `${keysToOld}`)
this.activeChatHeadUrl = url
this.requestUpdate()
} else {
const dataint8Array = base64ToUint8Array(decryptedKey.data)
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array)
if (!validateSecretKey(decryptedKeyToObject)) {
throw new Error("SecretKey is not valid")
}
localStorage.removeItem("symKeysCurrent")
localStorage.setItem("symKeysCurrent", "")
let oldSymIdentifier = JSON.parse(localStorage.getItem("symKeysCurrent") || "[]")
oldSymIdentifier.push(decryptedKeyToObject)
localStorage.setItem("symKeysCurrent", JSON.stringify(oldSymIdentifier))
let arraySecretKeys = JSON.parse(localStorage.getItem("symKeysCurrent") || "[]")
this.secretKeys = arraySecretKeys[0]
this.activeChatHeadUrl = url
this.requestUpdate()
}
localStorage.removeItem("symKeysCurrent")
localStorage.setItem("symKeysCurrent", "")
let oldSymIdentifier = JSON.parse(localStorage.getItem("symKeysCurrent") || "[]")
oldSymIdentifier.push(decryptedKeyToObject)
localStorage.setItem("symKeysCurrent", JSON.stringify(oldSymIdentifier))
let arraySecretKeys = JSON.parse(localStorage.getItem("symKeysCurrent") || "[]")
this.secretKeys = arraySecretKeys[0]
this.activeChatHeadUrl = url
this.requestUpdate()
} else {
this.activeChatHeadUrl = url
this.requestUpdate()

4
plugins/plugins/utils/functions.js
View File

@ -164,10 +164,10 @@ export const replaceMessagesEdited = async ({ decodedMessages, parentEpml, isRec
}
const sortedMessages = decodedMessages.sort((a, b) => b.timestamp - a.timestamp)
const result = sortedMessages.filter(({decodedMessage}) => !name.includes('isReaction'))
const withoutHubReactions = sortedMessages.filter(({decodedMessage}) => !decodedMessage.includes('isReaction'))
// Execute the functions with concurrency limit
const updatedMessages = await executeWithConcurrencyLimit(result, findUpdatedMessage)
const updatedMessages = await executeWithConcurrencyLimit(withoutHubReactions, findUpdatedMessage)
addToUpdateMessageHashmap(updatedMessages)
return updatedMessages