Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-12 02:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #142 from PhillipLangMartinez/bugfix/remove-reactions

Browse Source 
Bugfix/remove reactions
This commit is contained in:
AlphaX-Projects 2023-03-16 11:02:20 +01:00 committed by GitHub
commit 6f7d0d3950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qortal-ui-plugins/plugins/core/components/ChatPage.js
View File

@ -2766,7 +2766,8 @@ class ChatPage extends LitElement {
parentEpml,
isReceipient: isReceipient,
decodeMessageFunc: this.decodeMessage,
_publicKey: this._publicKey
_publicKey: this._publicKey,
isNotInitial: true
})
const renderEachMessage = replacedMessages.map(async(msg)=> {
@ -2829,7 +2830,7 @@ class ChatPage extends LitElement {
async renderNewMessage(newMessage) {
if(newMessage.chatReference){
const findOriginalMessageIndex = this.messagesRendered.findIndex(msg=> msg.signature === newMessage.chatReference || (msg.chatReference && msg.chatReference === newMessage.chatReference) )
if(findOriginalMessageIndex !== -1){
if(findOriginalMessageIndex !== -1 && this.messagesRendered[findOriginalMessageIndex].sender === newMessage.sender){
const newMessagesRendered = [...this.messagesRendered]
newMessagesRendered[findOriginalMessageIndex] = {...newMessage, timestamp: newMessagesRendered[findOriginalMessageIndex].timestamp, senderName: newMessagesRendered[findOriginalMessageIndex].senderName,
sender: newMessagesRendered[findOriginalMessageIndex].sender, editedTimestamp: newMessage.timestamp }

6
qortal-ui-plugins/plugins/core/components/ChatScroller.js
View File

@ -410,7 +410,7 @@ class MessageTemplate extends LitElement {
repliedToData = this.messageObj.repliedToData;
isImageDeleted = parsedMessageObj.isImageDeleted;
isAttachmentDeleted = parsedMessageObj.isAttachmentDeleted;
reactions = parsedMessageObj.reactions || [];
// reactions = parsedMessageObj.reactions || [];
version = parsedMessageObj.version;
isForwarded = parsedMessageObj.type === 'forward';
isEdited = parsedMessageObj.isEdited && true;
@ -1105,7 +1105,7 @@ class ChatMenu extends LitElement {
render() {
return html`
<div class="container">
<div
<!-- <div
class=${`menu-icon reaction ${!this.firstMessageInChat ? "tooltip" : ""}`}
data-text="${translate("blockpage.bcchange13")}"
@click=${(e) => {
@ -1122,7 +1122,7 @@ class ChatMenu extends LitElement {
}}
>
<vaadin-icon icon="vaadin:smiley-o" slot="icon"></vaadin-icon>
</div>
</div> -->
<div
class=${`menu-icon ${!this.firstMessageInChat ? "tooltip" : ""}`}
data-text="${translate("blockpage.bcchange14")}"

143
qortal-ui-plugins/plugins/utils/replace-messages-edited.js
View File

@ -6,112 +6,48 @@ export const replaceMessagesEdited = async ({
_publicKey
}) => {
const findNewMessages = decodedMessages.map(async (msg) => {
let originalMsg = msg
let msgItem = msg
try {
if(msg.chatReference){
originalMsg = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/message/${msg.chatReference}`,
})
originalMsg.chatReference = msg.chatReference
}
let msgQuery = `&involving=${originalMsg.recipient}&involving=${originalMsg.sender}`
let msgQuery = `&involving=${msg.recipient}&involving=${msg.sender}`
if (!isReceipient) {
msgQuery = `&txGroupId=${originalMsg.txGroupId}`
msgQuery = `&txGroupId=${msg.txGroupId}`
}
const response = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?chatreference=${originalMsg.signature}&reverse=true${msgQuery}`,
})
let decodedMsgs = []
response.map((eachMessage) => {
const msgRes = decodeMessageFunc(eachMessage, isReceipient, _publicKey)
let parsedMessageObj = originalMsg
try {
parsedMessageObj = JSON.parse(msgRes.decodedMessage)
decodedMsgs.push({
...msgRes,
decodedMessage: parsedMessageObj
})
} catch (error) {
}
})
const filterReactions = decodedMsgs.filter((message)=> {
if(!message.decodedMessage) return false
if(!message.decodedMessage.reactions || !Array.isArray(message.decodedMessage.reactions)) return false
return message.decodedMessage.reactions.length > 0
url: `/chat/messages?chatreference=${msg.signature}&reverse=true${msgQuery}&limit=1&sender=${msg.sender}`,
})
const filterWithoutReactions = decodedMsgs.filter((message)=> {
return message.sender === originalMsg.sender
})
if (filterReactions && Array.isArray(filterReactions) && filterReactions.length !== 0) {
let responseItem = { ...filterReactions[0] }
let parsedMessageMsg = {}
try {
parsedMessageMsg = JSON.parse(originalMsg.decodedMessage)
} catch (error) {
}
let originalPosterMsg = {
...originalMsg,
decodedMessage: parsedMessageMsg
}
if(filterWithoutReactions.length > 0){
originalPosterMsg = {
...filterWithoutReactions[0]
}
}
originalPosterMsg.decodedMessage = JSON.stringify({
...originalPosterMsg.decodedMessage,
reactions: responseItem.decodedMessage.reactions
})
if (response && Array.isArray(response) && response.length !== 0) {
let responseItem = { ...response[0] }
const decodeResponseItem = decodeMessageFunc(responseItem, isReceipient, _publicKey)
delete decodeResponseItem.timestamp
msgItem = {
...originalPosterMsg,
senderName: originalMsg.senderName,
sender: originalMsg.sender,
...msg,
...decodeResponseItem,
senderName: msg.senderName,
sender: msg.sender,
editedTimestamp: response[0].timestamp,
}
}
if ((!Array.isArray(filterReactions) || (filterReactions || []).length === 0) && filterWithoutReactions.length > 0) {
let responseItem = { ...filterWithoutReactions[0] }
const originalPosterMsg = JSON.stringify(responseItem.decodedMessage)
msgItem = {
...responseItem,
decodedMessage: originalPosterMsg,
timestamp: originalMsg.timestamp,
editedTimestamp: responseItem.timestamp,
}
}
} catch (error) {
}
return msgItem
})
const updateMessages = await Promise.all(findNewMessages)
const findNewMessages2 = updateMessages.map(async (originalMsg) => {
let parsedMessageObj = originalMsg
const findNewMessages2 = updateMessages.map(async (msg) => {
let parsedMessageObj = msg
try {
parsedMessageObj = JSON.parse(originalMsg.decodedMessage)
parsedMessageObj = JSON.parse(msg.decodedMessage)
} catch (error) {
return originalMsg
return msg
}
let msgItem = originalMsg
let msgItem = msg
try {
let msgQuery = `&involving=${originalMsg.recipient}&involving=${originalMsg.sender}`
let msgQuery = `&involving=${msg.recipient}&involving=${msg.sender}`
if (!isReceipient) {
msgQuery = `&txGroupId=${originalMsg.txGroupId}`
msgQuery = `&txGroupId=${msg.txGroupId}`
}
if (parsedMessageObj.repliedTo) {
let originalReply
@ -129,48 +65,31 @@ export const replaceMessagesEdited = async ({
}
const originalReplyMessage = originalReply.timestamp ? originalReply : originalReply.length !== 0 ? originalReply[0] : null
const response = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}&limit=1&sender=${originalReplyMessage.sender}`,
})
let decodedMsgs = []
response.map((eachMessage) => {
const msgRes = decodeMessageFunc(eachMessage, isReceipient, _publicKey)
let parsedMessageObj = originalMsg
try {
parsedMessageObj = JSON.parse(msgRes.decodedMessage)
decodedMsgs.push({
...msgRes,
decodedMessage: parsedMessageObj
})
} catch (error) {
}
})
const filterWithoutReactions = decodedMsgs.filter((message)=> {
return message.sender === originalMsg.sender
})
const originalReplyMessage = originalReply.timestamp ? originalReply : originalReply.length !== 0 ? originalReply[0] : null
if (
originalReplyMessage &&
filterWithoutReactions &&
Array.isArray(filterWithoutReactions) &&
filterWithoutReactions.length !== 0
response &&
Array.isArray(response) &&
response.length !== 0
) {
const decodeOriginalReply = decodeMessageFunc(originalReplyMessage, isReceipient, _publicKey)
const decodeUpdatedReply = decodeMessageFunc(filterWithoutReactions[0], isReceipient, _publicKey)
const decodeUpdatedReply = decodeMessageFunc(response[0], isReceipient, _publicKey)
const formattedRepliedToData = {
...decodeUpdatedReply,
senderName: decodeOriginalReply.senderName,
sender: decodeOriginalReply.sender,
}
msgItem = {
...originalMsg,
...msg,
repliedToData: formattedRepliedToData,
}
} else {
@ -181,7 +100,7 @@ export const replaceMessagesEdited = async ({
) {
msgItem = {
...originalMsg,
...msg,
repliedToData: decodeMessageFunc(originalReplyMessage, isReceipient, _publicKey),
}
}