fix(kit): await conversations in server load function again

src/lib/components/MobileNav.svelte

@@ -10,7 +10,7 @@
 	import IconNew from "$lib/components/icons/IconNew.svelte";
 
 	export let isOpen = false;
-	export let title: Promise<string | undefined> | string;
+	export let title: string | undefined;
 
 	$: title = title ?? "New Chat";
 

src/lib/components/NavMenu.svelte

@@ -11,7 +11,7 @@
 	import type { Model } from "$lib/types/Model";
 	import { page } from "$app/stores";
 
-	export let conversations: Promise<ConvSidebar[]>;
+	export let conversations: ConvSidebar[];
 	export let canLogin: boolean;
 	export let user: LayoutData["user"];
 
@@ -25,16 +25,16 @@
 		new Date().setMonth(new Date().getMonth() - 1),
 	];
 
-	$: groupedConversations = conversations.then((convs) => ({
-		today: convs.filter(({ updatedAt }) => updatedAt.getTime() > dateRanges[0]),
-		week: convs.filter(
+	$: groupedConversations = {
+		today: conversations.filter(({ updatedAt }) => updatedAt.getTime() > dateRanges[0]),
+		week: conversations.filter(
 			({ updatedAt }) => updatedAt.getTime() > dateRanges[1] && updatedAt.getTime() < dateRanges[0]
 		),
-		month: convs.filter(
+		month: conversations.filter(
 			({ updatedAt }) => updatedAt.getTime() > dateRanges[2] && updatedAt.getTime() < dateRanges[1]
 		),
-		older: convs.filter(({ updatedAt }) => updatedAt.getTime() < dateRanges[2]),
-	}));
+		older: conversations.filter(({ updatedAt }) => updatedAt.getTime() < dateRanges[2]),
+	};
 
 	const titles: { [key: string]: string } = {
 		today: "Today",

src/routes/+layout.server.ts

@@ -146,7 +146,7 @@ export const load: LayoutServerLoad = async ({ locals, depends }) => {
 
 	return {
 		nConversations,
-		conversations: conversations.then(
+		conversations: await conversations.then(
 			async (convs) =>
 				await Promise.all(
 					convs.map(async (conv) => {

src/routes/+layout.svelte

@@ -58,10 +58,7 @@
 				return;
 			}
 
-			data.conversations.then((convs) => {
-				const newConvs = convs.filter((conv) => conv.id !== id);
-				data.conversations = Promise.resolve(newConvs);
-			});
+			data.conversations = data.conversations.filter((conv) => conv.id !== id);
 
 			if ($page.params.id === id) {
 				await goto(`${base}/`, { invalidateAll: true });
@@ -87,10 +84,9 @@
 				return;
 			}
 
-			data.conversations.then((convs) => {
-				const newConvs = convs.map((conv) => (conv.id === id ? { ...conv, title } : conv));
-				data.conversations = Promise.resolve(newConvs);
-			});
+			data.conversations = data.conversations.map((conv) =>
+				conv.id === id ? { ...conv, title } : conv
+			);
 		} catch (err) {
 			console.error(err);
 			$error = String(err);
@@ -104,17 +100,13 @@
 	$: if ($error) onError();
 
 	$: if ($titleUpdate) {
-		data.conversations.then((convs) => {
-			const convIdx = convs.findIndex(({ id }) => id === $titleUpdate?.convId);
+		const convIdx = data.conversations.findIndex(({ id }) => id === $titleUpdate?.convId);
 
-			if (convIdx != -1) {
-				convs[convIdx].title = $titleUpdate?.title ?? convs[convIdx].title;
-			}
-			// update data.conversations
-			data.conversations = Promise.resolve([...convs]);
+		if (convIdx != -1) {
+			data.conversations[convIdx].title = $titleUpdate?.title ?? data.conversations[convIdx].title;
+		}
 
-			$titleUpdate = null;
-		});
+		$titleUpdate = null;
 	}
 
 	const settings = createSettingsStore(data.settings);
@@ -153,7 +145,7 @@
 
 	$: mobileNavTitle = ["/models", "/assistants", "/privacy"].includes($page.route.id ?? "")
 		? ""
-		: data.conversations.then((convs) => convs.find((conv) => conv.id === $page.params.id)?.title);
+		: data.conversations.find((conv) => conv.id === $page.params.id)?.title;
 </script>
 
 <svelte:head>

src/routes/conversation/[id]/+page.svelte

@@ -247,9 +247,7 @@
 				) {
 					$error = update.message ?? "An error has occurred";
 				} else if (update.type === MessageUpdateType.Title) {
-					const convInData = await data.conversations.then((convs) =>
-						convs.find(({ id }) => id === $page.params.id)
-					);
+					const convInData = data.conversations.find(({ id }) => id === $page.params.id);
 					if (convInData) {
 						convInData.title = update.title;
 
@@ -378,9 +376,7 @@
 	}
 
 	$: $page.params.id, (($isAborted = true), (loading = false), ($convTreeStore.editing = null));
-	$: title = data.conversations.then(
-		(convs) => convs.find((conv) => conv.id === $page.params.id)?.title ?? data.title
-	);
+	$: title = data.conversations.find((conv) => conv.id === $page.params.id)?.title ?? data.title;
 
 	const convTreeStore = createConvTreeStore();
 	const settings = useSettingsStore();