Drop nrelay, fix space threads

src/routes/spaces/[relay]/+layout.svelte

@@ -21,7 +21,7 @@
     getMembershipUrls,
     userMembership,
     roomsByUrl,
-    decodeNRelay,
+    decodeRelay,
     GENERAL,
   } from "@app/state"
   import {checkRelayConnection, checkRelayAuth} from "@app/commands"
@@ -58,7 +58,7 @@
   let delay = 0
   let showMenu = false
 
-  $: url = decodeNRelay($page.params.nrelay)
+  $: url = decodeRelay($page.params.relay)
   $: rooms = getMembershipRoomsByUrl(url, $userMembership)
   $: otherRooms = ($roomsByUrl.get(url) || []).filter(room => !rooms.concat(GENERAL).includes(room))
 

src/routes/spaces/[relay]/[[room]]/+page.svelte

@@ -26,7 +26,7 @@
   import ChannelCompose from "@app/components/ChannelCompose.svelte"
   import {
     userMembership,
-    decodeNRelay,
+    decodeRelay,
     makeChannelId,
     deriveChannel,
     GENERAL,
@@ -36,8 +36,8 @@
   } from "@app/state"
   import {addRoomMembership, removeRoomMembership} from "@app/commands"
 
-  const {nrelay, room = GENERAL} = $page.params
-  const url = decodeNRelay(nrelay)
+  const {room = GENERAL} = $page.params
+  const url = decodeRelay($page.params.relay)
   const channel = deriveChannel(makeChannelId(url, room))
   const thunks = writable({} as Record<string, Thunk>)
 

src/routes/spaces/[relay]/calendar/+page.svelte

@@ -13,9 +13,9 @@
   import EventItem from "@app/components/EventItem.svelte"
   import EventCreate from "@app/components/EventCreate.svelte"
   import {pushModal} from "@app/modal"
-  import {deriveEventsForUrl, pullConservatively, decodeNRelay} from "@app/state"
+  import {deriveEventsForUrl, pullConservatively, decodeRelay} from "@app/state"
 
-  const url = decodeNRelay($page.params.nrelay)
+  const url = decodeRelay($page.params.relay)
   const kinds = [EVENT_DATE, EVENT_TIME]
   const events = deriveEventsForUrl(url, kinds)
 

src/routes/spaces/[relay]/threads/+page.svelte

@@ -2,7 +2,7 @@
   import {onMount} from "svelte"
   import {page} from "$app/stores"
   import {NOTE} from "@welshman/util"
-  import {feedFromFilter} from "@welshman/feeds"
+  import {feedFromFilter, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
   import {nthEq} from "@welshman/lib"
   import {feedLoader} from "@welshman/app"
   import {createScroller} from "@lib/html"
@@ -13,12 +13,13 @@
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
   import {pushModal} from "@app/modal"
-  import {deriveEventsForUrl, decodeNRelay} from "@app/state"
+  import {deriveEventsForUrl, decodeRelay} from "@app/state"
 
-  const url = decodeNRelay($page.params.nrelay)
+  const url = decodeRelay($page.params.relay)
   const kinds = [NOTE]
+  const feed = makeIntersectionFeed(makeRelayFeed(url), feedFromFilter({kinds}))
   const events = deriveEventsForUrl(url, kinds)
-  const loader = feedLoader.getLoader(feedFromFilter({kinds}), {})
+  const loader = feedLoader.getLoader(feed, {})
 
   const createThread = () => pushModal(ThreadCreate, {url})
 
@@ -32,7 +33,7 @@
       onScroll: async () => {
         const $loader = await loader
 
-        $loader(5)
+        await $loader(5)
         limit += 5
       },
     })