Skip to content

Fix: Thread Message Deletion #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix: Thread Message Deletion #969

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f41970c
thread message
smritidoneria Feb 8, 2025
fdd5405
fixed lint error
smritidoneria Feb 9, 2025
8a0d206
Merge branch 'develop' into thread
smritidoneria Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 deletions packages/react/src/views/Message/Message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ import {
import { Attachments } from '../AttachmentHandler';
import { Markdown } from '../Markdown';
import MessageHeader from './MessageHeader';
import { useMessageStore, useUserStore, useSidebarStore } from '../../store';
import {
useMessageStore,
useUserStore,
useSidebarStore,
useChannelStore,
} from '../../store';
import RCContext from '../../context/RCInstance';
import { MessageBody } from './MessageBody';
import { MessageReactions } from './MessageReactions';
Expand Down Expand Up @@ -58,6 +63,7 @@ const Message = ({
const pinPermissions = useUserStore(
(state) => state.userPinPermissions.roles
);

const editMessagePermissions = useMessageStore(
(state) => state.editMessagePermissions.roles
);
Expand All @@ -72,8 +78,26 @@ const Message = ({
editMessage: state.editMessage,
setEditMessage: state.setEditMessage,
}));
const setThreadMessages = useMessageStore((state) => state.setThreadMessages);

const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate);
const isMe = message.u._id === authenticatedUserId;
const getThreadMessages = async (msgId, callback) => {
if (msgId) {
try {
const { messages } = await RCInstance.getThreadMessages(
msgId,
isChannelPrivate
);
setThreadMessages(messages);
setTimeout(() => {
callback?.(messages);
}, 0);
} catch (e) {
console.error(e);
}
}
};

const theme = useTheme();
const { mode } = useTheme();
Expand All @@ -94,7 +118,6 @@ const Message = ({
const bubbleStyles = useBubbleStyles(isMe);
const pinRoles = new Set(pinPermissions);
const editMessageRoles = new Set(editMessagePermissions);

const variantStyles =
!isInSidebar && variantOverrides === 'bubble' ? bubbleStyles : {};

Expand All @@ -116,6 +139,21 @@ const Message = ({
}
getStarredMessages();
};
const deleteThreadMessages = async (messagesToDelete) => {
try {
await Promise.all(
messagesToDelete.map(async (msg) => {
await RCInstance.deleteMessage(msg._id);
})
);
} catch (error) {
console.error('Failed to delete messages:', error);
dispatchToastMessage({
type: 'error',
message: 'Failed to delete messages',
});
}
};

const handlePinMessage = async (msg) => {
const isPinned = msg.pinned;
Expand Down Expand Up @@ -188,6 +226,12 @@ const Message = ({
type: 'success',
message: 'Message deleted successfully',
});

getThreadMessages(msg._id, async (threadMsgs) => {
if (threadMsgs.length > 0) {
await deleteThreadMessages(threadMsgs);
}
});
} else {
dispatchToastMessage({
type: 'error',
Expand Down
Loading