widget parole 16
This commit is contained in:
parent
ec4a0b7d7c
commit
4e7c22d97c
@ -182,9 +182,13 @@ export async function GET(request: Request) {
|
|||||||
|
|
||||||
if (messageData.success && messageData.messages?.length > 0) {
|
if (messageData.success && messageData.messages?.length > 0) {
|
||||||
const message = messageData.messages[0];
|
const message = messageData.messages[0];
|
||||||
|
const messageUser = message.u || {};
|
||||||
|
const username = messageUser.username || 'unknown';
|
||||||
|
const name = messageUser.name || username;
|
||||||
|
|
||||||
messages.push({
|
messages.push({
|
||||||
id: message._id,
|
id: message._id,
|
||||||
text: message.msg,
|
text: message.msg || '',
|
||||||
timestamp: message.ts,
|
timestamp: message.ts,
|
||||||
roomName: subscription.fname || subscription.name || 'Direct Message',
|
roomName: subscription.fname || subscription.name || 'Direct Message',
|
||||||
roomType: subscription.t,
|
roomType: subscription.t,
|
||||||
@ -192,18 +196,22 @@ export async function GET(request: Request) {
|
|||||||
userMentions: subscription.userMentions || 0,
|
userMentions: subscription.userMentions || 0,
|
||||||
alert: subscription.alert || false,
|
alert: subscription.alert || false,
|
||||||
lastSeen: subscription.ls,
|
lastSeen: subscription.ls,
|
||||||
|
u: { // Keep the original u object for backward compatibility
|
||||||
|
username: username,
|
||||||
|
name: name
|
||||||
|
},
|
||||||
sender: {
|
sender: {
|
||||||
username: message.u.username,
|
username: username,
|
||||||
name: message.u.name || message.u.username,
|
name: name,
|
||||||
initials: (message.u.name || message.u.username || '')
|
initials: name
|
||||||
.split(' ')
|
.split(' ')
|
||||||
.map((n: string) => n[0])
|
.map((n: string) => n[0])
|
||||||
.slice(0, 2)
|
.slice(0, 2)
|
||||||
.join('')
|
.join('')
|
||||||
.toUpperCase(),
|
.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: {
|
room: {
|
||||||
id: subscription.rid,
|
id: subscription.rid,
|
||||||
type: subscription.t,
|
type: subscription.t,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user