fix(hololive): wait for pinned streams

1 files changed, 17 insertions, 21 deletions

diff --git a/src/routes/hololive/+page.svelte b/src/routes/hololive/+page.svelte
index 771bc808..50e4ee2c 100644
--- a/src/routes/hololive/+page.svelte
+++ b/src/routes/hololive/+page.svelte
@@ -26,38 +26,34 @@
 	let schedulePromise: Promise<Response>;
 	let pinnedStreams: string[] = [];
 
-	$: {
-		pinnedStreams = pinnedStreams;
-
-		schedulePromise = fetch(proxy('https://schedule.hololive.tv'), {
-			headers: {
-				Cookie: 'timezone=Asia/Tokyo'
-			}
-		});
-	}
-
-	onMount(async () => {
-		// schedulePromise = fetch(proxy('https://schedule.hololive.tv'), {
-		// 	headers: {
-		// 		Cookie: 'timezone=Asia/Tokyo'
-		// 	}
-		// });
-
-		getPinnedStreams();
-	});
+	onMount(() => getPinnedStreams());
 
 	const getPinnedStreams = () => {
 		let streams: string[] = [];
 
-		if ($identity.id !== -2)
+		const setSchedule = () => {
+			pinnedStreams = streams;
+			schedulePromise = fetch(proxy('https://schedule.hololive.tv'), {
+				headers: {
+					Cookie: 'timezone=Asia/Tokyo'
+				}
+			});
+		};
+
+		if ($identity.id !== -2) {
 			fetch(root(`/api/configuration?id=${$identity.id}`)).then((response) => {
 				if (response.ok)
 					response.json().then((data) => {
 						if (data && data.configuration) streams = data.pinned_hololive_streams;
+
+						setSchedule();
 					});
 			});
 
-		pinnedStreams = streams;
+			return;
+		}
+
+		setSchedule();
 	};
 
 	const typeSchedule = (schedule: any) => schedule as ParseResult;