From 6b8e699d510eb3fde8fc5a87c3a898c2303904a9 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 27 Jan 2025 19:43:16 +1300
Subject: [PATCH] Speed up default page loading

---
 materialious/src/routes/(app)/+layout.svelte | 16 +---------------
 materialious/src/routes/+layout.ts           | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index 39ee8dc7..a66a5765 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
 
-	import { navigating, page } from '$app/stores';
+	import { navigating } from '$app/stores';
 	import '$lib/android/http/androidRequests';
 	import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/colorTheme';
 	import { getFeed } from '$lib/api/index';
@@ -21,7 +21,6 @@
 		darkModeStore,
 		instanceStore,
 		interfaceAmoledTheme,
-		interfaceDefaultPage,
 		showWarningStore,
 		syncPartyPeerStore,
 		themeColorStore
@@ -149,19 +148,6 @@
 	onMount(async () => {
 		ui();
 
-		if (
-			$interfaceDefaultPage &&
-			$interfaceDefaultPage !== '/' &&
-			$interfaceDefaultPage.startsWith('/') &&
-			$page.url.pathname === '/'
-		) {
-			getPages().forEach((page) => {
-				if (page.href === $interfaceDefaultPage && (!page.requiresAuth || $authStore)) {
-					goto($interfaceDefaultPage);
-				}
-			});
-		}
-
 		scrollableRoot = document.querySelector('.root');
 
 		loadSettingsFromEnv();
diff --git a/materialious/src/routes/+layout.ts b/materialious/src/routes/+layout.ts
index 2879758a..eedd356d 100644
--- a/materialious/src/routes/+layout.ts
+++ b/materialious/src/routes/+layout.ts
@@ -2,7 +2,10 @@ import { browser } from '$app/environment';
 import { goto } from '$app/navigation';
 import { getResolveUrl } from '$lib/api';
 import '$lib/i18n'; // Import to initialize. Important :)
+import { getPages } from '$lib/navPages.js';
+import { authStore, interfaceDefaultPage } from '$lib/store.js';
 import { locale, waitLocale } from 'svelte-i18n';
+import { get } from 'svelte/store';
 
 export let ssr = false;
 
@@ -18,6 +21,21 @@ export async function load({ url }) {
 		} catch { }
 	}
 
+	const defaultPage = get(interfaceDefaultPage);
+
+	if (
+		defaultPage &&
+		defaultPage !== '/' &&
+		defaultPage.startsWith('/') &&
+		url.pathname === '/'
+	) {
+		getPages().forEach((page) => {
+			if (page.href === defaultPage && (!page.requiresAuth || get(authStore))) {
+				goto(defaultPage);
+			}
+		});
+	}
+
 	if (browser) {
 		locale.set(window.navigator.language);
 	}