From f741bce32c07c562f5fe287e2464f8efdb995d47 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Fri, 1 Nov 2024 14:46:38 -0700
Subject: [PATCH] Listen for new threads and replies

---
 src/app/components/Content.svelte             |  2 +-
 src/app/components/PrimaryNav.svelte          |  5 +--
 .../spaces/[relay]/threads/+page.svelte       | 33 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index a0cf9a68..50fc05fa 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -92,7 +92,7 @@
       style={expandBlock ? "mask-image: linear-gradient(0deg, transparent 0px, black 100px)" : ""}>
       {#each shortContent as parsed, i}
         {#if isNewline(parsed)}
-          <ContentNewline value={parsed.value.slice(1) || "\n"} />
+          <ContentNewline value={parsed.value} />
         {:else if isTopic(parsed)}
           <ContentTopic value={parsed.value} />
         {:else if isCode(parsed)}
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 7077c89c..e5a696ae 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -44,10 +44,7 @@
           </PrimaryNavItem>
         {/each}
         <PrimaryNavItem title="Add Space" on:click={addSpace} class="tooltip-right">
-          <Avatar icon="add-circle" class="!h-10 !w-10" />
-        </PrimaryNavItem>
-        <PrimaryNavItem title="Discover Spaces" href="/discover" class="tooltip-right">
-          <Avatar icon="compass-big" class="!h-10 !w-10" />
+          <Avatar icon="settings-minimalistic" class="!h-10 !w-10" />
         </PrimaryNavItem>
       {/if}
     </div>
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/threads/+page.svelte
index 1314a513..e76335e1 100644
--- a/src/routes/spaces/[relay]/threads/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {page} from "$app/stores"
+  import {now, assoc} from "@welshman/lib"
   import {getListTags, getPubkeyTagValues} from "@welshman/util"
   import type {Filter} from "@welshman/util"
   import {feedsFromFilters, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
@@ -16,6 +17,7 @@
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
   import {THREAD, COMMENT, deriveEventsForUrl, decodeRelay} from "@app/state"
   import {pushModal, pushDrawer} from "@app/modal"
+  import {subscribePersistent} from "@app/commands"
 
   const url = decodeRelay($page.params.relay)
   const events = deriveEventsForUrl(url, [{kinds: [THREAD]}])
@@ -37,21 +39,26 @@
   let element: Element
 
   onMount(() => {
-    // Why is element not defined sometimes? SVELTEKIT
-    if (element) {
-      const scroller = createScroller({
-        element,
-        delay: 300,
-        threshold: 3000,
-        onScroll: async () => {
-          const $loader = await loader
+    const unsub = subscribePersistent({
+      filters: filters.map(assoc('since', now())),
+      relays: [url],
+    })
 
-          await $loader(5)
-          limit += 5
-        },
-      })
+    const scroller = createScroller({
+      element,
+      delay: 300,
+      threshold: 3000,
+      onScroll: async () => {
+        const $loader = await loader
 
-      return () => scroller.stop()
+        await $loader(5)
+        limit += 5
+      },
+    })
+
+    return () => {
+      unsub()
+      scroller.stop()
     }
   })
 </script>