Improve home feed refresh

1 files changed, 39 insertions, 30 deletions

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 5852aa5..7e0e6e6 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,44 +1,53 @@
 <script lang="ts">
   import ArticleHeader from "$lib/ArticleHeader.svelte";
-  import { ndk, signedIn } from "$lib/ndk";
-  import { NDKRelaySet, type NDKUser } from "@nostr-dev-kit/ndk";
-  const kind = 30040;
-  const count: number = 10;
+  import { indexKind } from "$lib/consts";
+  import { ndk } from "$lib/ndk";
+  import { NDKEvent, NDKRelayList, NDKRelaySet, type NDKUser } from "@nostr-dev-kit/ndk";
 
-  async function loadEvents(user?: NDKUser) {
-    if (user == null) {
-      return $ndk.fetchEvents(
-        { kinds: [kind] },
-        { closeOnEose: true }
-      );
-    }
+  const getEvents = (): Promise<Set<NDKEvent>> =>
+    $ndk.fetchEvents(
+      // @ts-ignore
+      { kinds: [indexKind] },
+    );
+
+  const getEventsFromUserRelays = (userRelays: NDKRelayList): Promise<Set<NDKEvent>> => {
+    const relaySet = NDKRelaySet.fromRelayUrls(userRelays!.readRelayUrls, $ndk);
 
-    const relays = await user.relayList();
-    const relaySet = NDKRelaySet.fromRelayUrls(relays!.readRelayUrls, $ndk);
-    
     // TODO: Add more filter parameters to customize the event feed.
     return $ndk.fetchEvents(
-      { authors: [user.pubkey, ], kinds: [kind] },
-      { closeOnEose: true },
+      // @ts-ignore
+      { kinds: [indexKind] },
       relaySet,
     );
-  }
+  };
 
-  $: eventList = loadEvents($ndk.activeUser);
+  let user: NDKUser | null | undefined;
+  let readRelays: NDKRelayList | null | undefined;
 
-  signedIn.subscribe(async isSignedIn => {
-    if (isSignedIn) {
-      eventList = loadEvents();
-    }
-  });
+  $: {
+    user = $ndk.activeUser;
+    user?.relayList().then(relays => readRelays = relays);
+  }
 </script>
 
 <div class='leather flex flex-col flex-grow-0 space-y-4 overflow-y-auto w-max'>
-  {#await eventList}
-    <p>Loading...</p>
-  {:then events}
-    {#each Array.from(events) as event}
-      <ArticleHeader {event} />
-    {/each}
-  {/await}
+  {#key user}
+    {#if user == null || readRelays == null}
+      {#await getEvents()}
+        <p>Loading...</p>
+      {:then events}
+        {#each Array.from(events) as event}
+          <ArticleHeader {event} />
+        {/each}
+      {/await}
+    {:else}
+      {#await getEventsFromUserRelays(readRelays)}
+        <p>Loading...</p>
+      {:then events}
+        {#each Array.from(events) as event}
+          <ArticleHeader {event} />
+        {/each}
+      {/await}
+    {/if}
+  {/key}
 </div>