Skip to content

🐛 (Channels): Fix channel comments and last message #176

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

Merged
Asmaa-204 merged 1 commit into from
Dec 23, 2024
Merged

🐛 (Channels): Fix channel comments and last message #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions app/src/features/chats/ChatBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ function ChatBody() {

const { handleNextMentionMessage, mentionMessages } = useTraversalMentions();


useEffect(() => {
if (inView && hasNextPage && chatId) {
const container = scrollContainerRef.current;
Expand All @@ -71,7 +70,7 @@ function ChatBody() {
let messages = chat?.messages;

if (chat?.type === "channel") {
messages?.filter((msg) => !msg.parentMessageId);
messages = messages?.filter((msg) => !msg.parentMessageId);
}

const threadMessages = activeThread
Expand Down
7 changes: 4 additions & 3 deletions app/src/features/chats/ChatItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ const ChatItem = ({
}: ChatItemProps) => {
const navigate = useNavigate();

const timestamp = lastMessage?.timestamp || "No messages";
const lastMessageContent =
RenderWithMention(lastMessage?.content!, lastMessage?._id!) || "No messages";
const timestamp = lastMessage?.timestamp || "No Messages Found";
const lastMessageContent = lastMessage?.content
? RenderWithMention(lastMessage?.content!, lastMessage?._id!)
: "No Messages Found";

const { chatId } = useParams<{ chatId: string }>();

Expand Down
14 changes: 11 additions & 3 deletions app/src/features/chats/utils/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ export function parseChatsToState(chatData?: any) {
(lastMessage: any) => lastMessage.chatId === chatId
)?.lastMessage;

let lastMessageContent = null;

if (incomingLastMessage) {
if (incomingLastMessage.isAppropriate) {
lastMessageContent = incomingLastMessage.content;
} else {
lastMessageContent = "🚫️ This message has inappropriate content.";
}
}

return {
_id: chatId,
isSeen: isSeen,
Expand All @@ -52,9 +62,7 @@ export function parseChatsToState(chatData?: any) {

lastMessage: {
_id: incomingLastMessage?.id,
content: incomingLastMessage?.isAppropriate
? incomingLastMessage?.content
: "🚫️ This message has inappropriate content.",
content: lastMessageContent,
senderId: incomingLastMessage?.senderId,
timestamp: incomingLastMessage?.timestamp,
contentType: incomingLastMessage?.contentType
Expand Down
Loading