alma/NeahFront7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget parole 23

Browse Source
This commit is contained in:
Alma 2025-04-13 10:39:34 +02:00
parent 7fe27f8b49
commit a851dbfbf5
1 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
app/api/rocket-chat/messages/route.ts
View File

@ -145,14 +145,8 @@ export async function GET(request: Request) {
// Filter subscriptions for the current user // Filter subscriptions for the current user
const userSubscriptions = subscriptionsData.update.filter((sub: any) => { const userSubscriptions = subscriptionsData.update.filter((sub: any) => {
// For direct messages (t: 'd') // Include all types of rooms the user is subscribed to
if (sub.t === 'd') { return ['d', 'c', 'p'].includes(sub.t);
// Make sure the room ID contains the current user's ID
const participants = sub.rid.split('');
return participants.includes(currentUser._id);
}
// For channels (t: 'c') and private groups (t: 'p')
return ['c', 'p'].includes(sub.t) && sub.u._id === currentUser._id;
}); });
console.log('Filtered user subscriptions:', { console.log('Filtered user subscriptions:', {
@ -163,8 +157,7 @@ export async function GET(request: Request) {
type: sub.t, type: sub.t,
name: sub.fname || sub.name, name: sub.fname || sub.name,
rid: sub.rid, rid: sub.rid,
alert: sub.alert, alert: sub.alert
isOwn: sub.u._id === currentUser._id
})) }))
}); });
@ -177,19 +170,25 @@ export async function GET(request: Request) {
processedRooms.add(subscription.rid); processedRooms.add(subscription.rid);
try { try {
// Determine the correct endpoint based on room type // Determine the correct endpoint and parameters based on room type
let endpoint; let endpoint;
if (subscription.t === 'c') { switch (subscription.t) {
endpoint = 'channels.messages'; case 'c':
} else if (subscription.t === 'p') { endpoint = 'channels.messages';
endpoint = 'groups.messages'; break;
} else { case 'p':
endpoint = 'im.messages'; endpoint = 'groups.messages';
break;
case 'd':
endpoint = 'im.messages';
break;
default:
continue;
} }
const queryParams = new URLSearchParams({ const queryParams = new URLSearchParams({
roomId: subscription.rid, roomId: subscription.rid,
count: '3' count: '5'
}); });
const messagesResponse = await fetch( const messagesResponse = await fetch(
@ -201,13 +200,11 @@ export async function GET(request: Request) {
if (!messagesResponse.ok) { if (!messagesResponse.ok) {
console.error(`Failed to get messages for room ${subscription.name}:`, messagesResponse.status); console.error(`Failed to get messages for room ${subscription.name}:`, messagesResponse.status);
const errorText = await messagesResponse.text();
console.error(`Messages error details for ${subscription.name}:`, errorText);
continue; continue;
} }
const messageData = await messagesResponse.json(); const messageData = await messagesResponse.json();
console.log(`Messages for room ${subscription.name}:`, { console.log(`Messages for room ${subscription.fname || subscription.name}:`, {
success: messageData.success, success: messageData.success,
count: messageData.count, count: messageData.count,
hasMessages: messageData.messages?.length > 0 hasMessages: messageData.messages?.length > 0
@ -217,10 +214,13 @@ export async function GET(request: Request) {
// Process each message from the room // Process each message from the room
for (const message of messageData.messages) { for (const message of messageData.messages) {
const messageUser = message.u || {}; const messageUser = message.u || {};
const username = messageUser.username || subscription.name || 'unknown'; const username = messageUser.username || 'unknown';
const displayName = subscription.fname || subscription.name || username;
// Format the timestamp // Get proper display names
let roomDisplayName = subscription.fname || subscription.name;
let userDisplayName = messageUser.name || username;
// Format timestamp
const timestamp = new Date(message.ts); const timestamp = new Date(message.ts);
const now = new Date(); const now = new Date();
let formattedTime = ''; let formattedTime = '';
@ -228,21 +228,19 @@ export async function GET(request: Request) {
if (isNaN(timestamp.getTime())) { if (isNaN(timestamp.getTime())) {
formattedTime = 'Invalid Date'; formattedTime = 'Invalid Date';
} else if (timestamp.toDateString() === now.toDateString()) { } else if (timestamp.toDateString() === now.toDateString()) {
// Today - show time only
formattedTime = timestamp.toLocaleTimeString('fr-FR', { formattedTime = timestamp.toLocaleTimeString('fr-FR', {
hour: '2-digit', hour: '2-digit',
minute: '2-digit' minute: '2-digit'
}); });
} else { } else {
// Not today - show date
formattedTime = timestamp.toLocaleDateString('fr-FR', { formattedTime = timestamp.toLocaleDateString('fr-FR', {
day: '2-digit', day: '2-digit',
month: 'short' month: 'short'
}); });
} }
// Create initials from display name // Create initials for the sender
const initials = displayName const initials = userDisplayName
.split(' ') .split(' ')
.map((n: string) => n[0]) .map((n: string) => n[0])
.slice(0, 2) .slice(0, 2)
@ -254,49 +252,43 @@ export async function GET(request: Request) {
text: message.msg || '', text: message.msg || '',
timestamp: formattedTime, timestamp: formattedTime,
rawTimestamp: message.ts, rawTimestamp: message.ts,
roomName: displayName, roomName: roomDisplayName,
roomType: subscription.t, roomType: subscription.t,
unread: subscription.unread || 0,
userMentions: subscription.userMentions || 0,
alert: subscription.alert || false,
lastSeen: subscription.ls,
u: messageUser,
sender: { sender: {
_id: messageUser._id, _id: messageUser._id,
username: username, username: username,
name: displayName, name: userDisplayName,
initials: initials, initials: initials,
color: getAvatarColor(username) color: getAvatarColor(username)
}, },
isOwnMessage: messageUser.username === currentUser.username, isOwnMessage: messageUser._id === currentUser._id,
room: { room: {
id: subscription.rid, id: subscription.rid,
type: subscription.t, type: subscription.t,
name: displayName, name: roomDisplayName,
isChannel: subscription.t === 'c', isChannel: subscription.t === 'c',
isPrivateGroup: subscription.t === 'p',
isDirect: subscription.t === 'd', isDirect: subscription.t === 'd',
link: subscription.t === 'c' link: `${baseUrl}/${subscription.t === 'd' ? 'direct' : subscription.t === 'p' ? 'group' : 'channel'}/${subscription.name}`
? `${baseUrl}/channel/${subscription.name}`
: `${baseUrl}/direct/${subscription.name}`
} }
}); });
} }
} }
} catch (error) { } catch (error) {
console.error(`Error fetching message for room ${subscription.name}:`, error); console.error(`Error fetching messages for room ${subscription.name}:`, error);
continue; continue;
} }
} }
// Sort messages by raw timestamp (newest first) and limit to 7 // Sort messages by timestamp (newest first) and limit
messages.sort((a, b) => new Date(b.rawTimestamp).getTime() - new Date(a.rawTimestamp).getTime()); const sortedMessages = messages
.sort((a, b) => new Date(b.rawTimestamp).getTime() - new Date(a.rawTimestamp).getTime())
const limitedMessages = messages.slice(0, 7); .slice(0, 10);
return NextResponse.json({ return NextResponse.json({
messages: limitedMessages, messages: sortedMessages,
total: messages.length, total: messages.length,
hasMore: messages.length > 7 hasMore: messages.length > 10
}, { status: 200 }); }, { status: 200 });
} catch (error) { } catch (error) {
console.error('Error in messages endpoint:', error); console.error('Error in messages endpoint:', error);