widget chat 12
This commit is contained in:
parent
56110e25ac
commit
fefd75bda6
@ -110,14 +110,30 @@ export async function GET() {
|
|||||||
|
|
||||||
if (messagesData.messages && messagesData.messages.length > 0) {
|
if (messagesData.messages && messagesData.messages.length > 0) {
|
||||||
const message = messagesData.messages[0];
|
const message = messagesData.messages[0];
|
||||||
// Only include messages where the user is either the sender or the recipient
|
|
||||||
if (message.u._id === rocketChatUserId ||
|
// For direct messages, check if the room ID contains the user's ID
|
||||||
(subscription.t === 'd' && subscription.rid.includes(rocketChatUserId))) {
|
if (subscription.t === 'd') {
|
||||||
return {
|
// Extract the other user's ID from the room ID
|
||||||
...message,
|
const roomIdParts = subscription.rid.split(rocketChatUserId);
|
||||||
roomName: subscription.fname || subscription.name || 'Direct Message',
|
const otherUserId = roomIdParts[0] || roomIdParts[1];
|
||||||
roomType: subscription.t,
|
|
||||||
};
|
// Only include messages where the user is either the sender or the recipient
|
||||||
|
if (message.u._id === rocketChatUserId || message.u._id === otherUserId) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
roomName: subscription.fname || subscription.name || 'Direct Message',
|
||||||
|
roomType: subscription.t,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// For channels and groups, only include messages where the user is the sender
|
||||||
|
if (message.u._id === rocketChatUserId) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
roomName: subscription.fname || subscription.name || 'Direct Message',
|
||||||
|
roomType: subscription.t,
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user