Bump welshman

src/app/components/ProfileDetail.svelte

@@ -1,47 +0,0 @@
-<script lang="ts">
-  import {onMount} from "svelte"
-  import {sortBy, flatten} from "@welshman/lib"
-  import {feedFromFilter} from "@welshman/feeds"
-  import {NOTE, getAncestorTags} from "@welshman/util"
-  import {deriveEvents} from "@welshman/store"
-  import {repository, feedLoader} from "@welshman/app"
-  import {createScroller} from "@lib/html"
-  import Spinner from "@lib/components/Spinner.svelte"
-  import NoteItem from "@app/components/NoteItem.svelte"
-
-  export let url
-  export let pubkey
-
-  const filter = {kinds: [NOTE], authors: [pubkey]}
-  const events = deriveEvents(repository, {filters: [filter]})
-  const loader = feedLoader.getLoader(feedFromFilter(filter), {})
-
-  let element: Element
-
-  onMount(() => {
-    const scroller = createScroller({
-      element,
-      onScroll: async () => {
-        const $loader = await loader
-
-        $loader(5)
-      },
-    })
-
-    return () => scroller.stop()
-  })
-</script>
-
-<div class="flex max-w-full flex-col gap-4 p-4" bind:this={element}>
-  <div class="flex flex-col gap-2">
-    {#each sortBy(e => -e.created_at, $events) as event (event.id)}
-      {#if flatten(Object.values(getAncestorTags(event.tags))).length === 0}
-        <NoteItem {url} {event} />
-      {/if}
-    {:else}
-      <p class="flex center my-12">
-        <Spinner loading />
-      </p>
-    {/each}
-  </div>
-</div>

src/app/components/ProfileFeed.svelte

@@ -1,10 +1,11 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {sortBy, flatten} from "@welshman/lib"
+  import {deriveEvents} from "@welshman/store"
   import {feedFromFilter} from "@welshman/feeds"
   import {NOTE, getAncestorTags} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
-  import {feedLoader} from "@welshman/app"
+  import {repository, createFeedController} from "@welshman/app"
   import {createScroller} from "@lib/html"
   import Spinner from "@lib/components/Spinner.svelte"
   import NoteItem from "@app/components/NoteItem.svelte"
@@ -13,25 +14,17 @@
   export let pubkey
 
   const filter = {kinds: [NOTE], authors: [pubkey]}
-  const loader = feedLoader.getLoader(feedFromFilter(filter), {
-    onEvent: (e: TrustedEvent) => {
-      events = sortBy(e => -e.created_at, [...events, e])
-    },
-  })
+  const events = deriveEvents(repository, {filters: [filter]})
 
   let element: Element
-  let events: TrustedEvent[] = []
 
   onMount(() => {
+    const ctrl = createFeedController({feed: feedFromFilter(filter)})
     const scroller = createScroller({
       element,
       delay: 300,
       threshold: 3000,
-      onScroll: async () => {
-        const $loader = await loader
-
-        $loader(5)
-      },
+      onScroll: () => ctrl.load(5)
     })
 
     return () => scroller.stop()
@@ -40,7 +33,7 @@
 
 <div class="col-4" bind:this={element}>
   <div class="flex flex-col gap-2">
-    {#each events as event (event.id)}
+    {#each sortBy(e => -e.created_at, $events) as event (event.id)}
       {#if flatten(Object.values(getAncestorTags(event.tags))).length === 0}
         <NoteItem {url} {event} />
       {/if}

src/app/components/RelayItem.svelte

@@ -9,7 +9,7 @@
 
   const relay = deriveRelay(url)
 
-  $: connections = $relay?.stats?.connect_count || 0
+  $: connections = $relay?.stats?.open_count || 0
 </script>
 
 <div class="card2 card2-sm bg-alt column gap-2">