From 4e7c22d97c184a37c5d710e9cb44e51ae757009d Mon Sep 17 00:00:00 2001 From: Alma Date: Sun, 13 Apr 2025 01:10:25 +0200 Subject: [PATCH] widget parole 16 --- app/api/rocket-chat/messages/route.ts | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/api/rocket-chat/messages/route.ts b/app/api/rocket-chat/messages/route.ts index 4b896761..7db08f55 100644 --- a/app/api/rocket-chat/messages/route.ts +++ b/app/api/rocket-chat/messages/route.ts @@ -182,9 +182,13 @@ export async function GET(request: Request) { if (messageData.success && messageData.messages?.length > 0) { const message = messageData.messages[0]; + const messageUser = message.u || {}; + const username = messageUser.username || 'unknown'; + const name = messageUser.name || username; + messages.push({ id: message._id, - text: message.msg, + text: message.msg || '', timestamp: message.ts, roomName: subscription.fname || subscription.name || 'Direct Message', roomType: subscription.t, @@ -192,18 +196,22 @@ export async function GET(request: Request) { userMentions: subscription.userMentions || 0, alert: subscription.alert || false, lastSeen: subscription.ls, + u: { // Keep the original u object for backward compatibility + username: username, + name: name + }, sender: { - username: message.u.username, - name: message.u.name || message.u.username, - initials: (message.u.name || message.u.username || '') + username: username, + name: name, + initials: name .split(' ') .map((n: string) => n[0]) .slice(0, 2) .join('') .toUpperCase(), - color: message.u.username === currentUser.username ? '#E3E3E3' : getAvatarColor(message.u.username) + color: username === currentUser.username ? '#E3E3E3' : getAvatarColor(username) }, - isOwnMessage: message.u.username === currentUser.username, + isOwnMessage: username === currentUser.username, room: { id: subscription.rid, type: subscription.t,