Qortal/chrome-extension
3
0
Fork 0
mirror of https://github.com/Qortal/chrome-extension.git synced 2025-02-11 17:55:49 +00:00
Code Issues Projects Releases Wiki Activity

fix reaction bug

Browse Source
This commit is contained in:
PhilReact 2024-09-27 16:16:45 +03:00
parent 56b66cf988
commit 1144e4280a
2 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/components/Chat/ChatGroup.tsx
View File

@ -100,7 +100,6 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
})
}
const decryptMessages = (encryptedMessages: any[])=> {
try {
@ -162,26 +161,33 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
organizedChatReferences[item.chatReference].reactions[content] =
organizedChatReferences[item.chatReference].reactions[content] || [];
const existingReactionIndex = organizedChatReferences[item.chatReference].reactions[content]
.findIndex(reaction => reaction.sender === sender);
// Remove any existing reactions from the same sender before adding the new one
let latestTimestampForSender = null;
// Handle contentState: if false, remove the reaction
if (contentState === false) {
if (existingReactionIndex !== -1) {
organizedChatReferences[item.chatReference].reactions[content].splice(existingReactionIndex, 1);
}
} else {
// Add or update reaction
if (existingReactionIndex !== -1) {
const existingReaction = organizedChatReferences[item.chatReference].reactions[content][existingReactionIndex];
const existingTimestamp = existingReaction.timestamp;
if (newTimestamp > existingTimestamp) {
organizedChatReferences[item.chatReference].reactions[content][existingReactionIndex] = item;
// Track the latest reaction timestamp for the same content and sender
organizedChatReferences[item.chatReference].reactions[content] =
organizedChatReferences[item.chatReference].reactions[content].filter((reaction) => {
if (reaction.sender === sender) {
// Track the latest timestamp for this sender
latestTimestampForSender = Math.max(latestTimestampForSender || 0, reaction.timestamp);
}
} else {
organizedChatReferences[item.chatReference].reactions[content].push(item);
}
return reaction.sender !== sender;
});
// Compare with the latest tracked timestamp for this sender
if (latestTimestampForSender && newTimestamp < latestTimestampForSender) {
// Ignore this item if it's older than the latest known reaction
return;
}
// Add the new reaction only if contentState is true
if (contentState !== false) {
organizedChatReferences[item.chatReference].reactions[content].push(item);
}
// If the reactions for a specific content are empty, clean up the object
if (organizedChatReferences[item.chatReference].reactions[content].length === 0) {
delete organizedChatReferences[item.chatReference].reactions[content];
}
} catch (error) {
console.error("Error processing reaction item:", error, item);
@ -192,6 +198,7 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
});
} else {
const formatted = response.filter((rawItem)=> !rawItem?.chatReference).map((item: any)=> {
return {
@ -230,26 +237,33 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
organizedChatReferences[item.chatReference].reactions[content] =
organizedChatReferences[item.chatReference].reactions[content] || [];
const existingReactionIndex = organizedChatReferences[item.chatReference].reactions[content]
.findIndex(reaction => reaction.sender === sender);
// Remove any existing reactions from the same sender before adding the new one
let latestTimestampForSender = null;
// Handle contentState: if false, remove the reaction
if (contentState === false) {
if (existingReactionIndex !== -1) {
organizedChatReferences[item.chatReference].reactions[content].splice(existingReactionIndex, 1);
}
} else {
// Add or update reaction
if (existingReactionIndex !== -1) {
const existingReaction = organizedChatReferences[item.chatReference].reactions[content][existingReactionIndex];
const existingTimestamp = existingReaction.timestamp;
if (newTimestamp > existingTimestamp) {
organizedChatReferences[item.chatReference].reactions[content][existingReactionIndex] = item;
// Track the latest reaction timestamp for the same content and sender
organizedChatReferences[item.chatReference].reactions[content] =
organizedChatReferences[item.chatReference].reactions[content].filter((reaction) => {
if (reaction.sender === sender) {
// Track the latest timestamp for this sender
latestTimestampForSender = Math.max(latestTimestampForSender || 0, reaction.timestamp);
}
} else {
organizedChatReferences[item.chatReference].reactions[content].push(item);
}
return reaction.sender !== sender;
});
// Compare with the latest tracked timestamp for this sender
if (latestTimestampForSender && newTimestamp < latestTimestampForSender) {
// Ignore this item if it's older than the latest known reaction
return;
}
// Add the new reaction only if contentState is true
if (contentState !== false) {
organizedChatReferences[item.chatReference].reactions[content].push(item);
}
// If the reactions for a specific content are empty, clean up the object
if (organizedChatReferences[item.chatReference].reactions[content].length === 0) {
delete organizedChatReferences[item.chatReference].reactions[content];
}
} catch (error) {
console.error("Error processing reaction item:", error, item);
@ -262,6 +276,7 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
}
}
rej(response.error)

6
src/components/Chat/MessageItem.tsx
View File

@ -234,7 +234,11 @@ export const MessageItem = ({
handleReaction(reaction, message, true)
}
}}>
<div>{reaction}</div>
<div>{reaction}</div> {numberOfReactions > 1 && (
<Typography sx={{
marginLeft: '4px'
}}>{' '} {numberOfReactions}</Typography>
)}
</ButtonBase>
)
})}