blah/Weblah
1
0
Fork 0
mirror of https://github.com/Blah-IM/Weblah.git synced 2025-05-01 00:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: update to new room info protocol

Browse source
This commit is contained in:
Shibo Lyu 2024-09-03 23:12:41 +08:00
parent 48f9c32918
commit f34ad89b79
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib/blah/connection/chatServer.ts
View file

@ -91,12 +91,17 @@ export class BlahChatServerConnection {
await this.apiCall('POST', `/room/${room}/item`, payload);
}
async fetchRoom(
roomId: string
): Promise<{ room: BlahRoomInfo; messages: BlahSignedPayload<BlahMessage>[] }> {
const [room, messages]: [BlahRoomInfo, [number, BlahSignedPayload<BlahMessage>][]] =
await this.apiCall('GET', `/room/${roomId}/item`);
return { room, messages: messages.toSorted(([a], [b]) => a - b).map(([, message]) => message) };
async fetchRoomInfo(roomId: string): Promise<BlahRoomInfo> {
const room: BlahRoomInfo = await this.apiCall('GET', `/room/${roomId}`);
return room;
}
async fetchRoomHistory(roomId: string): Promise<BlahSignedPayload<BlahMessage>[]> {
const { items }: { items: BlahSignedPayload<BlahMessage>[] } = await this.apiCall(
'GET',
`/room/${roomId}/item`
);
return items;
}
private createEventSource(roomId: string): EventSource {

17
src/routes/(app)/chats/[chatId]/+page.svelte
View file

@ -33,14 +33,25 @@
return server;
}
async function loadChat(server: BlahChatServerConnection) {
const { room, messages: blahMessages } = await server.fetchRoom(roomId);
async function loadChatInfo(server: BlahChatServerConnection) {
const room = await server.fetchRoomInfo(roomId);
chat = {
id: roomId,
name: room.title,
type: 'group'
};
messages = [...blahMessages.map(messageFromBlah), ...messages];
}
async function loadChatHistory(server: BlahChatServerConnection) {
const history = await server.fetchRoomHistory(roomId);
messages = [
...history.map(messageFromBlah).toSorted((a, b) => a.date.getTime() - b.date.getTime()),
...messages
];
}
async function loadChat(server: BlahChatServerConnection) {
return await Promise.allSettled([loadChatInfo(server), loadChatHistory(server)]);
}
$: if (browser) initConnection($currentKeyPair).then((server) => loadChat(server));