Refactor connections

SnowCait · Oct 14, 2023 · 7e8039d · 7e8039d
1 parent 93d05a7
commit 7e8039d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/web/src/routes/+layout.ts b/web/src/routes/+layout.ts
@@ -3,12 +3,17 @@ import { browser } from '$app/environment';
 import { Login } from '$lib/Login';
 import { WebStorage } from '$lib/WebStorage';
 import '$lib/i18n';
+import { rxNostr } from '$lib/timelines/MainTimeline';
+import { defaultRelays } from '$lib/Constants';
 
 export const load = async () => {
 	console.log('[layout load]');
 	if (browser) {
 		locale.set(window.navigator.language);
-		await tryLogin();
+		const success = await tryLogin();
+		if (!success) {
+			await rxNostr.switchRelays(defaultRelays);
+		}
 	}
 	await waitLocale();
 };

diff --git a/web/src/routes/[npub=npub]/+page.svelte b/web/src/routes/[npub=npub]/+page.svelte
@@ -105,10 +105,6 @@
 			return;
 		}
 
-		if (rxNostr.getRelays().length === 0) {
-			await rxNostr.switchRelays(relays);
-		}
-
 		let firstLength = events.length;
 		let count = 0;
 		let until =

diff --git a/web/src/routes/[npub=npub]/timeline/UserFollowingTimeline.svelte b/web/src/routes/[npub=npub]/timeline/UserFollowingTimeline.svelte
@@ -44,10 +44,6 @@
 			return;
 		}
 
-		if (rxNostr.getRelays().length === 0) {
-			await rxNostr.switchRelays($readRelays);
-		}
-
 		let firstLength = $items.length;
 		let count = 0;
 		let until =

diff --git a/web/src/routes/[slug=note]/+page.svelte b/web/src/routes/[slug=note]/+page.svelte
@@ -68,10 +68,6 @@
 
 		clear();
 
-		if (rxNostr.getRelays().length === 0) {
-			await rxNostr.switchRelays($readRelays);
-		}
-
 		for (const relay of relays) {
 			await rxNostr.addRelay({ url: relay, read: true, write: false });
 		}