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

update widget token mail 14

Browse Source
This commit is contained in:
Alma 2025-04-10 00:08:47 +02:00
parent 57353f6c31
commit 797e478fbb
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,9 +90,9 @@ export async function GET() {
username: userInfo.user.username username: userInfo.user.username
}); });
// Get the user's subscriptions (rooms they are in) // Get the user's subscriptions (rooms they are in) using their user ID
const subscriptionsResponse = await fetch( const subscriptionsResponse = await fetch(
'https://parole.slm-lab.net/api/v1/subscriptions.get', `https://parole.slm-lab.net/api/v1/users.list.rooms?userId=${userInfo.user._id}`,
{ {
headers: { headers: {
'X-Auth-Token': ROCKET_CHAT_TOKEN, 'X-Auth-Token': ROCKET_CHAT_TOKEN,
@ -115,17 +115,18 @@ export async function GET() {
} }
const subscriptions = await subscriptionsResponse.json(); const subscriptions = await subscriptionsResponse.json();
if (!subscriptions.update || subscriptions.update.length === 0) { console.log('Subscriptions response:', subscriptions);
if (!subscriptions.rooms || subscriptions.rooms.length === 0) {
return NextResponse.json({ messages: [] }); return NextResponse.json({ messages: [] });
} }
// Get the last message from each room // Get the last message from each room
const messages = await Promise.all( const messages = await Promise.all(
subscriptions.update.map(async (room: any) => { subscriptions.rooms.map(async (room: any) => {
if (!room.lastMessage?._id) return null; // Get the most recent messages from the room
const messagesResponse = await fetch(
const messageResponse = await fetch( `https://parole.slm-lab.net/api/v1/channels.messages?roomId=${room._id}&count=1`,
`https://parole.slm-lab.net/api/v1/chat.getMessage?msgId=${room.lastMessage._id}`,
{ {
headers: { headers: {
'X-Auth-Token': ROCKET_CHAT_TOKEN, 'X-Auth-Token': ROCKET_CHAT_TOKEN,
@ -135,20 +136,23 @@ export async function GET() {
} }
); );
if (messageResponse.ok) { if (messagesResponse.ok) {
const messageData = await messageResponse.json(); const messagesData = await messagesResponse.json();
return { if (messagesData.messages && messagesData.messages.length > 0) {
...messageData.message, const message = messagesData.messages[0];
roomName: room.name || 'Direct Message', return {
roomType: room.t, ...message,
}; roomName: room.name || 'Direct Message',
roomType: room.t,
};
}
} else {
console.error('Failed to fetch messages for room:', {
roomId: room._id,
status: messagesResponse.status,
response: await messagesResponse.text().catch(() => 'Could not get response text')
});
} }
console.error('Failed to fetch message:', {
roomId: room._id,
messageId: room.lastMessage._id,
status: messageResponse.status,
response: await messageResponse.text().catch(() => 'Could not get response text')
});
return null; return null;
}) })
); );
@ -158,6 +162,7 @@ export async function GET() {
.filter((msg): msg is NonNullable<typeof msg> => msg !== null) .filter((msg): msg is NonNullable<typeof msg> => msg !== null)
.sort((a, b) => new Date(b.ts).getTime() - new Date(a.ts).getTime()); .sort((a, b) => new Date(b.ts).getTime() - new Date(a.ts).getTime());
console.log('Found messages:', validMessages.length);
return NextResponse.json({ messages: validMessages }); return NextResponse.json({ messages: validMessages });
} catch (error) { } catch (error) {
console.error('Error fetching messages:', error); console.error('Error fetching messages:', error);