fix unsupported redirects

sandwichfarm · Dec 19, 2024 · bd56c14 · bd56c14
1 parent 48767c3
commit bd56c14
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/apps/gui/src/lib/components/blocks/Header.svelte b/apps/gui/src/lib/components/blocks/Header.svelte
@@ -4,24 +4,24 @@
     import { doBootstrap } from '$lib/stores/routines';
 	import { hasBeenBoostrapped } from '$lib/stores/app';
     import { totalMonitors } from '$lib/stores';
+	import { unsupported } from '$lib/stores/app';
   
     $: isHomepage = $page.url.pathname === '/';
     $: isBootstrapped = hasBeenBoostrapped();
     $: loadedEnough = hasBeenBoostrapped() || $totalMonitors.size > 1
 </script>
 
 <header id="site-header">
-
+    {#if (loadedEnough || !$doBootstrap) && !$unsupported}
     <h1>nostr.watch</h1>
-    {#if loadedEnough || !$doBootstrap}
     <nav>
         <a href="/">home</a>
         <a href="/relays">relays</a>
         <a href="/monitors">monitors</a>
         <a href="/preferences">preferences</a>
     </nav>
     {/if}
-    {#if !isHomepage}
+    {#if !isHomepage && (loadedEnough || !$doBootstrap) && !$unsupported}
     <div class="search-container">
         <search>
             <AutoSuggestRelays />        

diff --git a/apps/gui/src/lib/stores/app.ts b/apps/gui/src/lib/stores/app.ts
@@ -4,6 +4,7 @@ import { readable, writable, derived, get } from "svelte/store";
 import { formatSeconds, timeAgo } from "../utils/time";
 
 
+export const unsupported: Writable<boolean> = writable(false)
 export const isLivesyncing: Writable<boolean> = writable(false)
 export const isBootstrapping: Writable<boolean> = writable(false)
 export const lastCompleteSync: Writable<number> = writable(StateManager.get('lastCompleteSync') ?? 0)

diff --git a/apps/gui/src/routes/+layout.svelte b/apps/gui/src/routes/+layout.svelte
@@ -15,14 +15,16 @@ import { destroy } from '$lib/utils/lifecycle';
 import { createTabLifecycle } from '$lib/utils/tab-lifecycle';
 import { delay } from '@nostrwatch/utils';
 import { getBrowserInfo } from '$lib/utils/compat.js';
-	import { StateManager } from '@nostrwatch/nip66';
+import { StateManager } from '@nostrwatch/nip66';
+import { unsupported } from '$lib/stores/app';
 
 const isLeader: Writable<boolean> = writable(false);
 
 const lifecycle = createTabLifecycle();
 
 lifecycle.onStartLeader(async () => {
   isLeader.set(true);
+  if($unsupported) return;
   await loadData(); 
   console.log('Leader tab: DB initialized.');
 });
@@ -48,6 +50,7 @@ lifecycle.onWaitForLeaderRelease(() => {
 lifecycle.onLeaderAcquired(async () => {
   console.log('Non-leader tab: Just became leader, initializing DB.');
   isLeader.set(true);
+  if($unsupported) return;
   await loadData(); 
 });
 
@@ -81,21 +84,27 @@ const loadData = async () => {
   }    
 }
 
-onDestroy(unsubscribe);
+const checkSupport = () => {
+  const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+  const isMobile = /Android|iPhone|iPad|iPod|Opera Mini|IEMobile|Mobile/i.test(userAgent);
+  const isSafari = getBrowserInfo()?.name.toLowerCase().includes('safari')
 
-onMount(async () => {
-    const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-    const isMobile = /Android|iPhone|iPad|iPod|Opera Mini|IEMobile|Mobile/i.test(userAgent);
-    const isSafari = getBrowserInfo()?.name.toLowerCase().includes('safari')
+  unsupported.set(isSafari || isMobile)
 
-    if (isMobile && $page.url.pathname !== '/mobile') {
-        goto('/mobile'); 
-    }
+  if (isMobile && $page.url.pathname !== '/mobile') {
+    goto('/mobile'); 
+  }
 
-    if(isSafari && $page.url.pathname !== '/unsupported') {
-      goto('/unsupported');
-    }
+  if(isSafari && $page.url.pathname !== '/unsupported') {
+    goto('/unsupported');
+  }
+}
+
+onDestroy(unsubscribe);
 
+onMount(async () => {
+    
+    checkSupport()
     
     const version = StateManager.get('version')
     if(!version || version !== 2) { //TODO NEED A LOCAL STORAGE SCHEMA VERFSIONING SYSTEM!!!
@@ -116,6 +125,7 @@ onMount(async () => {
 
 $effect(() => {
   if ($navigating) {
+    checkSupport();
     loadData();
   }
 });

diff --git a/libraries/nip66/src/services/MonitorService.ts b/libraries/nip66/src/services/MonitorService.ts
@@ -602,8 +602,8 @@ export class MonitorService extends Service {
 
 
   async modifyReturnedEvents(events: IEvent[]): Promise<IEvent[]> {
-    // return events;
-    return this.removeStaleChecks(events);  
+    return events;
+    // return this.removeStaleChecks(events);  
   }
 
   async removeStaleChecks(events: IEvent[]): Promise<IEvent[]> {