From e0099141aa9bd076f79fa38dd212523a4dda6f91 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 6 Oct 2025 11:23:19 -0700
Subject: [PATCH] Refactor synchronization logic

---
 src/app/components/MenuSpace.svelte           |  25 +--
 src/app/components/MenuSpaceButton.svelte     |   2 +-
 .../components/NewNotificationSound.svelte    |   3 +-
 src/app/components/ProfileBadges.svelte       |   6 +-
 src/app/components/ReactionSummary.svelte     |   4 +-
 src/app/components/SpaceJoinConfirm.svelte    |  13 +-
 src/app/core/requests.ts                      | 169 ++++-----------
 src/app/core/state.ts                         |  56 +++--
 src/app/core/sync.ts                          | 194 +++++++++++++++---
 src/app/util/notifications.ts                 |  17 ++
 src/routes/chat/+layout.svelte                |  12 +-
 src/routes/spaces/[relay]/+layout.svelte      |  26 +--
 src/routes/spaces/[relay]/[room]/+page.svelte |  43 +---
 .../spaces/[relay]/calendar/+page.svelte      |  22 +-
 src/routes/spaces/[relay]/chat/+page.svelte   |  34 +--
 src/routes/spaces/[relay]/goals/+page.svelte  |  52 ++---
 .../spaces/[relay]/threads/+page.svelte       |  54 ++---
 17 files changed, 357 insertions(+), 375 deletions(-)

diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte
index eca97a59..9731c4e9 100644
--- a/src/app/components/MenuSpace.svelte
+++ b/src/app/components/MenuSpace.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import {onMount} from "svelte"
+  import {derived} from "svelte/store"
   import {displayRelayUrl, getTagValue, EVENT_TIME, ZAP_GOAL, THREAD} from "@welshman/util"
-  import {deriveRelay, repository} from "@welshman/app"
+  import {deriveRelay} from "@welshman/app"
   import {fly} from "@lib/transition"
   import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
   import RemoteControllerMinimalistic from "@assets/icons/remote-controller-minimalistic.svg?dataurl"
@@ -36,12 +37,13 @@
   import MenuSpaceRoomItem from "@app/components/MenuSpaceRoomItem.svelte"
   import {
     ENABLE_ZAPS,
+    MESSAGE_FILTER,
     userRoomsByUrl,
     hasMembershipUrl,
     memberships,
+    deriveEventsForUrl,
     deriveUserRooms,
     deriveOtherRooms,
-    trackerStore,
     hasNip29,
     alerts,
     deriveUserCanCreateRoom,
@@ -62,16 +64,9 @@
   const owner = $derived($relay?.profile?.pubkey)
   const hasAlerts = $derived($alerts.some(a => getTagValue("feed", a.tags)?.includes(url)))
 
-  const spaceKinds = $derived(
-    Array.from($trackerStore.getIds(url)).reduce((kinds, id) => {
-      const event = repository.getEvent(id)
-
-      if (event) {
-        kinds.add(event.kind)
-      }
-
-      return kinds
-    }, new Set()),
+  const spaceKinds = derived(
+    deriveEventsForUrl(url, [MESSAGE_FILTER]),
+    $events => new Set($events.map(e => e.kind)),
   )
 
   const openMenu = () => {
@@ -196,7 +191,7 @@
           <Icon icon={ChatRound} /> Chat
         </SecondaryNavItem>
       {/if}
-      {#if ENABLE_ZAPS && spaceKinds.has(ZAP_GOAL)}
+      {#if ENABLE_ZAPS && $spaceKinds.has(ZAP_GOAL)}
         <SecondaryNavItem
           {replaceState}
           href={goalsPath}
@@ -204,7 +199,7 @@
           <Icon icon={StarFallMinimalistic} /> Goals
         </SecondaryNavItem>
       {/if}
-      {#if spaceKinds.has(THREAD)}
+      {#if $spaceKinds.has(THREAD)}
         <SecondaryNavItem
           {replaceState}
           href={threadsPath}
@@ -212,7 +207,7 @@
           <Icon icon={NotesMinimalistic} /> Threads
         </SecondaryNavItem>
       {/if}
-      {#if spaceKinds.has(EVENT_TIME)}
+      {#if $spaceKinds.has(EVENT_TIME)}
         <SecondaryNavItem
           {replaceState}
           href={calendarPath}
diff --git a/src/app/components/MenuSpaceButton.svelte b/src/app/components/MenuSpaceButton.svelte
index d8d0b02c..209acc71 100644
--- a/src/app/components/MenuSpaceButton.svelte
+++ b/src/app/components/MenuSpaceButton.svelte
@@ -9,7 +9,7 @@
 
   const {url} = $props()
 
-  const path = makeSpacePath(url)
+  const path = makeSpacePath(url) + ":mobile"
 
   const openMenu = () => pushDrawer(MenuSpace, {url})
 </script>
diff --git a/src/app/components/NewNotificationSound.svelte b/src/app/components/NewNotificationSound.svelte
index a6d23712..d6a13ee4 100644
--- a/src/app/components/NewNotificationSound.svelte
+++ b/src/app/components/NewNotificationSound.svelte
@@ -14,11 +14,12 @@
       enabled = false
     }
   })
+
   let notificationCount = $state($notifications.size)
 
   const playSound = () => {
     if (enabled && $userSettingsValues.play_notification_sound) {
-      audioElement.play()
+      audioElement?.play()
     }
   }
 
diff --git a/src/app/components/ProfileBadges.svelte b/src/app/components/ProfileBadges.svelte
index 5520b534..e99d7261 100644
--- a/src/app/components/ProfileBadges.svelte
+++ b/src/app/components/ProfileBadges.svelte
@@ -5,11 +5,11 @@
   import type {Filter} from "@welshman/util"
   import {deriveEvents} from "@welshman/store"
   import {formatTimestampRelative} from "@welshman/lib"
-  import {NOTE, ROOMS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util"
+  import {NOTE, ROOMS, COMMENT, getRelayTags, getListTags} from "@welshman/util"
   import {repository, loadRelaySelections} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
-  import {membershipsByPubkey} from "@app/core/state"
+  import {membershipsByPubkey, MESSAGE_KINDS} from "@app/core/state"
   import {goToEvent} from "@app/util/routes"
   import {pushModal} from "@app/util/modal"
 
@@ -36,7 +36,7 @@
     load({
       filters: [
         {authors: [pubkey], kinds: [ROOMS]},
-        {authors: [pubkey], limit: 1, kinds: [NOTE, MESSAGE, THREAD, COMMENT]},
+        {authors: [pubkey], limit: 1, kinds: [NOTE, COMMENT, ...MESSAGE_KINDS]},
       ],
       relays: Router.get().FromPubkeys([pubkey]).getUrls(),
     })
diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte
index 0bba7337..325d569c 100644
--- a/src/app/components/ReactionSummary.svelte
+++ b/src/app/components/ReactionSummary.svelte
@@ -3,6 +3,7 @@
   import type {Snippet} from "svelte"
   import {groupBy, sum, uniq, uniqBy, batch, displayList} from "@welshman/lib"
   import {
+    REPORT,
     REACTION,
     ZAP_RESPONSE,
     getReplyFilters,
@@ -10,7 +11,6 @@
     getEmojiTag,
     fromMsats,
     getTag,
-    REPORT,
     DELETE,
   } from "@welshman/util"
   import type {TrustedEvent, EventContent, Zap} from "@welshman/util"
@@ -96,7 +96,7 @@
       load({
         relays: [url],
         signal: controller.signal,
-        filters: getReplyFilters([event], {kinds: [REPORT, DELETE, ...REACTION_KINDS]}),
+        filters: getReplyFilters([event], {kinds: REACTION_KINDS}),
         onEvent: batch(300, (events: TrustedEvent[]) => {
           load({
             relays: [url],
diff --git a/src/app/components/SpaceJoinConfirm.svelte b/src/app/components/SpaceJoinConfirm.svelte
index a58c1b5f..c048340a 100644
--- a/src/app/components/SpaceJoinConfirm.svelte
+++ b/src/app/components/SpaceJoinConfirm.svelte
@@ -1,8 +1,6 @@
 <script module lang="ts">
   import {goto} from "$app/navigation"
   import {dissoc} from "@welshman/lib"
-  import {ROOM_META} from "@welshman/util"
-  import {load} from "@welshman/net"
   import {pushToast} from "@app/util/toast"
   import {makeSpacePath} from "@app/util/routes"
   import {addSpaceMembership, broadcastUserData} from "@app/core/commands"
@@ -11,17 +9,8 @@
   export const confirmSpaceJoin = async (url: string) => {
     await addSpaceMembership(url)
 
-    const path = makeSpacePath(url)
-
-    if (window.location.pathname === path) {
-      load({
-        relays: [url],
-        filters: [{kinds: [ROOM_META]}],
-      })
-    }
-
     broadcastUserData([url])
-    goto(path, {replaceState: true})
+    goto(makeSpacePath(url), {replaceState: true})
     relaysMostlyRestricted.update(dissoc(url))
     pushToast({message: "Welcome to the space!"})
   }
diff --git a/src/app/core/requests.ts b/src/app/core/requests.ts
index 05e9ce24..8588fcfe 100644
--- a/src/app/core/requests.ts
+++ b/src/app/core/requests.ts
@@ -1,20 +1,18 @@
 import {get, writable} from "svelte/store"
 import {
-  partition,
   uniq,
   int,
   YEAR,
   DAY,
   insertAt,
   sortBy,
-  assoc,
   now,
+  on,
   isNotNil,
   filterVals,
   fromPairs,
 } from "@welshman/lib"
 import {
-  DELETE,
   EVENT_TIME,
   AUTH_INVITE,
   ALERT_EMAIL,
@@ -23,7 +21,6 @@ import {
   ALERT_ANDROID,
   ALERT_STATUS,
   matchFilters,
-  getTagValues,
   getTagValue,
   getAddress,
   isShareableRelayUrl,
@@ -32,74 +29,37 @@ import {
 import type {TrustedEvent, Filter, List} from "@welshman/util"
 import {feedFromFilters, makeRelayFeed, makeIntersectionFeed} from "@welshman/feeds"
 import {load, request} from "@welshman/net"
-import type {AppSyncOpts, Thunk} from "@welshman/app"
-import {
-  repository,
-  pull,
-  hasNegentropy,
-  thunkQueue,
-  makeFeedController,
-  loadRelay,
-} from "@welshman/app"
+import {repository, makeFeedController, loadRelay} from "@welshman/app"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
-import {NOTIFIER_RELAY, getUrlsForEvent} from "@app/core/state"
+import {NOTIFIER_RELAY, getEventsForUrl} from "@app/core/state"
 
 // Utils
 
-export const pullConservatively = ({relays, filters}: AppSyncOpts) => {
-  const $getUrlsForEvent = get(getUrlsForEvent)
-  const [smart, dumb] = partition(hasNegentropy, relays)
-  const promises = [pull({relays: smart, filters})]
-  const allEvents = repository.query(filters, {shouldSort: false})
-
-  // Since pulling from relays without negentropy is expensive, limit how many
-  // duplicates we repeatedly download
-  for (const url of dumb) {
-    const events = allEvents.filter(e => $getUrlsForEvent(e.id).includes(url))
-
-    if (events.length > 100) {
-      filters = filters.map(assoc("since", events[10]!.created_at))
-    }
-
-    promises.push(pull({relays: [url], filters}))
-  }
-
-  return Promise.all(promises)
-}
-
 export const makeFeed = ({
-  relays,
-  feedFilters,
-  subscriptionFilters,
+  url,
+  filters,
   element,
-  onEvent,
   onExhausted,
-  initialEvents = [],
 }: {
-  relays: string[]
-  feedFilters: Filter[]
-  subscriptionFilters: Filter[]
+  url: string
+  filters: Filter[]
   element: HTMLElement
-  onEvent?: (event: TrustedEvent) => void
   onExhausted?: () => void
-  initialEvents?: TrustedEvent[]
 }) => {
-  const seen = new Set<string>()
-  const buffer = writable<TrustedEvent[]>([])
-  const events = writable(initialEvents)
+  const initialEvents = getEventsForUrl(url, filters)
+  const seen = new Set(initialEvents.map(e => e.id))
   const controller = new AbortController()
-
-  const markEvent = (event: TrustedEvent) => {
-    if (!seen.has(event.id)) {
-      seen.add(event.id)
-      onEvent?.(event)
-    }
-  }
+  const buffer = writable(initialEvents)
+  const events = writable<TrustedEvent[]>([])
 
   const insertEvent = (event: TrustedEvent) => {
     let handled = false
 
+    if (seen.has(event.id)) {
+      return
+    }
+
     events.update($events => {
       for (let i = 0; i < $events.length; i++) {
         if ($events[i].id === event.id) return $events
@@ -123,47 +83,27 @@ export const makeFeed = ({
       })
     }
 
-    markEvent(event)
+    seen.add(event.id)
   }
 
-  const removeEvents = (ids: string[]) => {
-    buffer.update($buffer => $buffer.filter(e => !ids.includes(e.id)))
-    events.update($events => $events.filter(e => !ids.includes(e.id)))
-  }
-
-  const handleDelete = (e: TrustedEvent) => removeEvents(getTagValues(["e", "a"], e.tags))
-
-  const onThunk = (thunk: Thunk) => {
-    if (matchFilters(feedFilters, thunk.event)) {
-      insertEvent(thunk.event)
-
-      thunk.controller.signal.addEventListener("abort", () => {
-        removeEvents([thunk.event.id])
-      })
-    } else if (thunk.event.kind === DELETE) {
-      handleDelete(thunk.event)
+  const unsubscribe = on(repository, "update", ({added, removed}) => {
+    if (removed.size > 0) {
+      buffer.update($buffer => $buffer.filter(e => !removed.has(e.id)))
+      events.update($events => $events.filter(e => !removed.has(e.id)))
     }
-  }
+
+    for (const event of added) {
+      if (matchFilters(filters, event)) {
+        insertEvent(event)
+      }
+    }
+  })
 
   const ctrl = makeFeedController({
     useWindowing: true,
-    feed: makeIntersectionFeed(makeRelayFeed(...relays), feedFromFilters(feedFilters)),
-    onEvent: insertEvent,
-    onExhausted,
-  })
-
-  for (const event of initialEvents) {
-    markEvent(event)
-  }
-
-  request({
-    relays,
     signal: controller.signal,
-    filters: subscriptionFilters,
-    onEvent: (e: TrustedEvent) => {
-      if (matchFilters(feedFilters, e)) insertEvent(e)
-      if (e.kind === DELETE) handleDelete(e)
-    },
+    feed: makeIntersectionFeed(makeRelayFeed(url), feedFromFilters(filters)),
+    onExhausted,
   })
 
   const scroller = createScroller({
@@ -173,7 +113,7 @@ export const makeFeed = ({
     onScroll: async () => {
       const $buffer = get(buffer)
 
-      events.update($events => sortBy(e => -e.created_at, [...$events, ...$buffer.splice(0, 100)]))
+      events.update($events => [...$events, ...$buffer.splice(0, 100)])
 
       if ($buffer.length < 100) {
         ctrl.load(100)
@@ -181,8 +121,6 @@ export const makeFeed = ({
     },
   })
 
-  const unsubscribe = thunkQueue.subscribe(onThunk)
-
   return {
     events,
     cleanup: () => {
@@ -194,22 +132,19 @@ export const makeFeed = ({
 }
 
 export const makeCalendarFeed = ({
-  relays,
-  feedFilters,
-  subscriptionFilters,
+  url,
+  filters,
   element,
   onExhausted,
-  initialEvents = [],
 }: {
-  relays: string[]
-  feedFilters: Filter[]
-  subscriptionFilters: Filter[]
+  url: string
+  filters: Filter[]
   element: HTMLElement
   onExhausted?: () => void
-  initialEvents?: TrustedEvent[]
 }) => {
   const interval = int(5, DAY)
   const controller = new AbortController()
+  const initialEvents = getEventsForUrl(url, filters)
 
   let exhaustedScrollers = 0
   let backwardWindow = [now() - interval, now()]
@@ -237,38 +172,26 @@ export const makeCalendarFeed = ({
     })
   }
 
-  const removeEvents = (ids: string[]) => {
-    events.update($events => $events.filter(e => !ids.includes(e.id)))
-  }
-
-  const onThunk = (thunk: Thunk) => {
-    if (matchFilters(feedFilters, thunk.event)) {
-      insertEvent(thunk.event)
-
-      thunk.controller.signal.addEventListener("abort", () => {
-        removeEvents([thunk.event.id])
-      })
+  const unsubscribe = on(repository, "update", ({added, removed}) => {
+    if (removed.size > 0) {
+      events.update($events => $events.filter(e => !removed.has(e.id)))
     }
-  }
 
-  request({
-    relays,
-    signal: controller.signal,
-    filters: subscriptionFilters,
-    onEvent: (e: TrustedEvent) => {
-      if (matchFilters(feedFilters, e)) insertEvent(e)
-    },
+    for (const event of added) {
+      if (matchFilters(filters, event)) {
+        insertEvent(event)
+      }
+    }
   })
 
   const loadTimeframe = (since: number, until: number) => {
     const hashes = daysBetween(since, until).map(String)
 
     request({
-      relays,
-      signal: controller.signal,
+      relays: [url],
       autoClose: true,
+      signal: controller.signal,
       filters: [{kinds: [EVENT_TIME], "#D": hashes}],
-      onEvent: insertEvent,
     })
   }
 
@@ -311,8 +234,6 @@ export const makeCalendarFeed = ({
     },
   })
 
-  const unsubscribe = thunkQueue.subscribe(onThunk)
-
   return {
     events,
     cleanup: () => {
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index 7fe66f55..0dc553a3 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -5,6 +5,7 @@ import * as nip19 from "nostr-tools/nip19"
 import {
   on,
   call,
+  assoc,
   remove,
   uniqBy,
   sortBy,
@@ -38,6 +39,7 @@ import {isKindFeed, findFeed} from "@welshman/feeds"
 import {
   getIdFilters,
   WRAP,
+  DELETE,
   CLIENT_AUTH,
   AUTH_JOIN,
   REACTION,
@@ -50,6 +52,7 @@ import {
   ROOMS,
   THREAD,
   COMMENT,
+  REPORT,
   ROOM_JOIN,
   ROOM_ADD_USER,
   ROOM_REMOVE_USER,
@@ -60,6 +63,8 @@ import {
   ALERT_ANDROID,
   ALERT_STATUS,
   APP_DATA,
+  ZAP_GOAL,
+  EVENT_TIME,
   getGroupTags,
   getRelayTagValues,
   getPubkeyTagValues,
@@ -114,8 +119,6 @@ export const PROTECTED = ["-"]
 
 export const ENABLE_ZAPS = Capacitor.getPlatform() != "ios"
 
-export const REACTION_KINDS = ENABLE_ZAPS ? [REACTION, ZAP_RESPONSE] : [REACTION]
-
 export const NOTIFIER_PUBKEY = import.meta.env.VITE_NOTIFIER_PUBKEY
 
 export const NOTIFIER_RELAY = import.meta.env.VITE_NOTIFIER_RELAY
@@ -280,22 +283,27 @@ export const getUrlsForEvent = derived([trackerStore, thunks], ([$tracker, $thun
 })
 
 export const getEventsForUrl = (url: string, filters: Filter[]) => {
-  const $getUrlsForEvent = get(getUrlsForEvent)
-  const $events = repository.query(filters)
+  const ids = uniq([
+    ...tracker.getIds(url),
+    ...Array.from(flattenThunks(Object.values(get(thunks))))
+      .filter(t => t.options.relays.includes(url))
+      .map(t => t.event.id),
+  ])
 
-  return sortBy(
-    e => -e.created_at,
-    $events.filter(e => $getUrlsForEvent(e.id).includes(url)),
-  )
+  return repository.query(filters.map(assoc("ids", ids)))
 }
 
 export const deriveEventsForUrl = (url: string, filters: Filter[]) =>
-  derived([deriveEvents(repository, {filters}), getUrlsForEvent], ([$events, $getUrlsForEvent]) =>
-    sortBy(
-      e => -e.created_at,
-      $events.filter(e => $getUrlsForEvent(e.id).includes(url)),
-    ),
-  )
+  derived([trackerStore, thunks], ([$tracker, $thunks]) => {
+    const ids = uniq([
+      ...$tracker.getIds(url),
+      ...Array.from(flattenThunks(Object.values($thunks)))
+        .filter(t => t.options.relays.includes(url))
+        .map(t => t.event.id),
+    ])
+
+    return repository.query(filters.map(assoc("ids", ids)))
+  })
 
 // Context
 
@@ -306,6 +314,26 @@ routerContext.getIndexerRelays = always(INDEXER_RELAYS)
 netContext.isEventValid = (event: TrustedEvent, url: string) =>
   getSetting<string[]>("trusted_relays").includes(url) || verifyEvent(event)
 
+// Filters
+
+export const makeCommentFilter = (kinds: number[], extra: Filter = {}) => ({
+  kinds: [COMMENT],
+  "#K": kinds.map(String),
+  ...extra,
+})
+
+export const REACTION_KINDS = [REPORT, DELETE, REACTION]
+
+if (ENABLE_ZAPS) {
+  REACTION_KINDS.push(ZAP_RESPONSE)
+}
+
+export const MESSAGE_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, MESSAGE]
+
+export const MESSAGE_FILTER = {kinds: MESSAGE_KINDS}
+
+export const COMMENT_FILTER = makeCommentFilter(MESSAGE_KINDS)
+
 // Settings
 
 export const canDecrypt = synced({
diff --git a/src/app/core/sync.ts b/src/app/core/sync.ts
index 3ea0d3b0..687b61be 100644
--- a/src/app/core/sync.ts
+++ b/src/app/core/sync.ts
@@ -1,19 +1,31 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
 import {derived, get} from "svelte/store"
-import {call, chunk, sleep, now, identity, WEEK, ago} from "@welshman/lib"
+import {
+  partition,
+  call,
+  sortBy,
+  assoc,
+  chunk,
+  sleep,
+  now,
+  identity,
+  WEEK,
+  MONTH,
+  ago,
+} from "@welshman/lib"
 import {
   getListTags,
   getRelayTagValues,
   WRAP,
-  MESSAGE,
-  ZAP_GOAL,
-  THREAD,
-  EVENT_TIME,
-  COMMENT,
+  ROOM_META,
+  ROOM_ADD_USER,
+  ROOM_REMOVE_USER,
   isSignedEvent,
+  normalizeRelayUrl,
 } from "@welshman/util"
-import {request, pull} from "@welshman/net"
+import type {Filter, TrustedEvent} from "@welshman/util"
+import {request, load, pull} from "@welshman/net"
 import {
   pubkey,
   loadRelay,
@@ -27,17 +39,54 @@ import {
   loadMutes,
   loadProfile,
   repository,
+  hasNegentropy,
 } from "@welshman/app"
 import {
+  MESSAGE_FILTER,
+  COMMENT_FILTER,
   INDEXER_RELAYS,
+  REACTION_KINDS,
   canDecrypt,
   loadSettings,
   userMembership,
   defaultPubkeys,
   decodeRelay,
   loadMembership,
+  getUrlsForEvent,
 } from "@app/core/state"
 import {loadAlerts, loadAlertStatuses} from "@app/core/requests"
+import {hasBlossomSupport} from "@app/core/commands"
+
+// Utils
+
+type PullOpts = {
+  relays: string[]
+  filters: Filter[]
+  signal: AbortSignal
+}
+
+const pullConservatively = ({relays, filters, signal}: PullOpts) => {
+  const $getUrlsForEvent = get(getUrlsForEvent)
+  const [smart, dumb] = partition(hasNegentropy, relays)
+  const events = repository.query(filters, {shouldSort: false}).filter(isSignedEvent)
+  const promises: Promise<TrustedEvent[]>[] = [pull({relays: smart, filters, signal, events})]
+
+  // Since pulling from relays without negentropy is expensive, limit how many
+  // duplicates we repeatedly download
+  for (const url of dumb) {
+    const urlEvents = events.filter(e => $getUrlsForEvent(e.id).includes(url))
+
+    if (urlEvents.length >= 100) {
+      filters = filters.map(assoc("since", sortBy(e => -e.created_at, urlEvents)[10]!.created_at))
+    }
+
+    promises.push(load({relays: [url], filters, signal}))
+  }
+
+  return Promise.all(promises)
+}
+
+// Relays
 
 const syncRelays = () => {
   for (const url of INDEXER_RELAYS) {
@@ -46,7 +95,10 @@ const syncRelays = () => {
 
   const unsubscribePage = page.subscribe($page => {
     if ($page.params.relay) {
-      loadRelay(decodeRelay($page.params.relay))
+      const url = decodeRelay($page.params.relay)
+
+      loadRelay(url)
+      hasBlossomSupport(url)
     }
   })
 
@@ -62,6 +114,8 @@ const syncRelays = () => {
   }
 }
 
+// User data
+
 const syncUserData = () => {
   const unsubscribePubkey = pubkey.subscribe($pubkey => {
     if ($pubkey) {
@@ -107,40 +161,40 @@ const syncUserData = () => {
   }
 }
 
-const syncSpace = (url: string) => {
+// Memberships
+
+const syncMembership = (url: string) => {
   const controller = new AbortController()
 
-  // Load historical data
-  pull({
+  // Load group metadata
+  pullConservatively({
     relays: [url],
     signal: controller.signal,
-    filters: [{kinds: [ZAP_GOAL, EVENT_TIME, THREAD, MESSAGE, COMMENT]}],
-    events: repository
-      .query([{kinds: [ZAP_GOAL, EVENT_TIME, THREAD, MESSAGE, COMMENT]}])
-      .filter(isSignedEvent),
+    filters: [{kinds: [ROOM_META]}],
   })
 
-  // Load new events
+  // Load historical data from up to a month ago for quick page loading
+  pullConservatively({
+    relays: [url],
+    signal: controller.signal,
+    filters: [MESSAGE_FILTER, COMMENT_FILTER].map(assoc("since", ago(MONTH))),
+  })
+
+  // Listen for new events
   request({
     relays: [url],
     signal: controller.signal,
-    filters: [{kinds: [ZAP_GOAL, EVENT_TIME, THREAD, MESSAGE, COMMENT], since: now()}],
+    filters: [MESSAGE_FILTER, COMMENT_FILTER].map(assoc("since", now())),
   })
 
   return () => controller.abort()
 }
 
-const syncSpaces = () => {
+const syncMemberships = () => {
   const unsubscribersByUrl = new Map<string, Unsubscriber>()
-  const unsubscribeMembership = userMembership.subscribe($l => {
-    const urls = getRelayTagValues(getListTags($l))
 
-    // Start syncing newly added spaces
-    for (const url of urls) {
-      if (!unsubscribersByUrl.has(url)) {
-        unsubscribersByUrl.set(url, syncSpace(url))
-      }
-    }
+  const unsubscribeMembership = userMembership.subscribe($l => {
+    const urls = getRelayTagValues(getListTags($l)).map(normalizeRelayUrl)
 
     // stop syncing removed spaces
     for (const [url, unsubscribe] of unsubscribersByUrl.entries()) {
@@ -149,6 +203,13 @@ const syncSpaces = () => {
         unsubscribe()
       }
     }
+
+    // Start syncing newly added spaces
+    for (const url of urls) {
+      if (!unsubscribersByUrl.has(url)) {
+        unsubscribersByUrl.set(url, syncMembership(url))
+      }
+    }
   })
 
   return () => {
@@ -157,17 +218,80 @@ const syncSpaces = () => {
   }
 }
 
+// Sync extra stuff for the current space
+
+const syncSpace = (url: string) => {
+  const $pubkey = pubkey.get()
+  const controller = new AbortController()
+
+  // Load all membership changes for the current user
+  if ($pubkey) {
+    pullConservatively({
+      relays: [url],
+      signal: controller.signal,
+      filters: [
+        {
+          kinds: [ROOM_ADD_USER, ROOM_REMOVE_USER],
+          "#p": [$pubkey],
+        },
+      ],
+    })
+  }
+
+  // Listen actively for all current membership changes, reports, reactions, zaps, etc
+  request({
+    relays: [url],
+    signal: controller.signal,
+    filters: [
+      {
+        kinds: [ROOM_ADD_USER, ROOM_REMOVE_USER, ...REACTION_KINDS],
+        since: now(),
+      },
+    ],
+  })
+
+  return () => controller.abort()
+}
+
+const syncCurrentSpace = () => {
+  const unsubscribersByUrl = new Map<string, Unsubscriber>()
+
+  // Sync the space the user is currently visiting
+  const unsubscribePage = page.subscribe($page => {
+    if ($page.params.relay) {
+      const url = decodeRelay($page.params.relay)
+
+      if (!unsubscribersByUrl.has(url)) {
+        unsubscribersByUrl.set(url, syncSpace(url))
+      }
+
+      for (const [oldUrl, unsubscribe] of unsubscribersByUrl.entries()) {
+        if (url !== oldUrl) {
+          unsubscribersByUrl.delete(oldUrl)
+          unsubscribe()
+        }
+      }
+    } else {
+      Array.from(unsubscribersByUrl.values()).forEach(call)
+    }
+  })
+
+  return () => {
+    Array.from(unsubscribersByUrl.values()).forEach(call)
+    unsubscribePage()
+  }
+}
+
+// DMs
+
 const syncDMRelay = (url: string, pubkey: string) => {
   const controller = new AbortController()
 
   // Load historical data
-  pull({
+  pullConservatively({
     relays: [url],
     signal: controller.signal,
     filters: [{kinds: [WRAP], "#p": [pubkey], until: ago(WEEK, 2)}],
-    events: repository
-      .query([{kinds: [ZAP_GOAL, EVENT_TIME, THREAD, MESSAGE, COMMENT]}])
-      .filter(isSignedEvent),
   })
 
   // Load new events
@@ -243,8 +367,16 @@ const syncDMs = () => {
   }
 }
 
+// Merge all synchronization functions
+
 export const syncApplicationData = () => {
-  const unsubscribers = [syncRelays(), syncUserData(), syncSpaces(), syncDMs()]
+  const unsubscribers = [
+    syncRelays(),
+    syncUserData(),
+    syncMemberships(),
+    syncCurrentSpace(),
+    syncDMs(),
+  ]
 
   return () => unsubscribers.forEach(call)
 }
diff --git a/src/app/util/notifications.ts b/src/app/util/notifications.ts
index 272a6b8f..c104f3d1 100644
--- a/src/app/util/notifications.ts
+++ b/src/app/util/notifications.ts
@@ -87,6 +87,7 @@ export const notifications = derived(
 
     for (const [url, rooms] of $userRoomsByUrl.entries()) {
       const spacePath = makeSpacePath(url)
+      const spacePathMobile = spacePath + ":mobile"
       const goalPath = makeGoalPath(url)
       const threadPath = makeThreadPath(url)
       const calendarPath = makeCalendarPath(url)
@@ -104,9 +105,14 @@ export const notifications = derived(
       for (const [goalId, [comment]] of commentsByGoalId.entries()) {
         const goalItemPath = makeGoalPath(url, goalId)
 
+        if (hasNotification(spacePathMobile, comment)) {
+          paths.add(spacePathMobile)
+        }
+
         if (hasNotification(goalPath, comment)) {
           paths.add(goalPath)
         }
+
         if (hasNotification(goalItemPath, comment)) {
           paths.add(goalItemPath)
         }
@@ -120,9 +126,14 @@ export const notifications = derived(
       for (const [threadId, [comment]] of commentsByThreadId.entries()) {
         const threadItemPath = makeThreadPath(url, threadId)
 
+        if (hasNotification(spacePathMobile, comment)) {
+          paths.add(spacePathMobile)
+        }
+
         if (hasNotification(threadPath, comment)) {
           paths.add(threadPath)
         }
+
         if (hasNotification(threadItemPath, comment)) {
           paths.add(threadItemPath)
         }
@@ -136,6 +147,10 @@ export const notifications = derived(
       for (const [eventId, [comment]] of commentsByEventId.entries()) {
         const calendarItemPath = makeCalendarPath(url, eventId)
 
+        if (hasNotification(spacePathMobile, comment)) {
+          paths.add(spacePathMobile)
+        }
+
         if (hasNotification(calendarPath, comment)) {
           paths.add(calendarPath)
         }
@@ -153,12 +168,14 @@ export const notifications = derived(
           )
 
           if (hasNotification(roomPath, latestEvent)) {
+            paths.add(spacePathMobile)
             paths.add(spacePath)
             paths.add(roomPath)
           }
         }
       } else {
         if (hasNotification(messagesPath, messages[0])) {
+          paths.add(spacePathMobile)
           paths.add(spacePath)
           paths.add(messagesPath)
         }
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte
index f5f9df7e..20bb65ab 100644
--- a/src/routes/chat/+layout.svelte
+++ b/src/routes/chat/+layout.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
   import {page} from "$app/stores"
-  import {WRAP} from "@welshman/util"
-  import {Router} from "@welshman/router"
-  import {pubkey} from "@welshman/app"
+  import {sleep} from "@welshman/lib"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -16,7 +14,6 @@
   import ChatMenu from "@app/components/ChatMenu.svelte"
   import ChatItem from "@app/components/ChatItem.svelte"
   import {chatSearch} from "@app/core/state"
-  import {pullConservatively} from "@app/core/requests"
   import {pushModal} from "@app/util/modal"
 
   type Props = {
@@ -27,14 +24,11 @@
 
   const openMenu = () => pushModal(ChatMenu)
 
-  const promise = pullConservatively({
-    filters: [{kinds: [WRAP], "#p": [$pubkey!]}],
-    relays: Router.get().UserInbox().getUrls(),
-  })
-
   let term = $state("")
 
   const chats = $derived($chatSearch.searchOptions(term))
+
+  const promise = sleep(10000)
 </script>
 
 <SecondaryNav>
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index e4705a35..f5fd83b9 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -2,8 +2,8 @@
   import type {Snippet} from "svelte"
   import {onMount} from "svelte"
   import {page} from "$app/stores"
-  import {ago, sleep, once, MONTH} from "@welshman/lib"
-  import {ROOM_META, EVENT_TIME, THREAD, COMMENT, MESSAGE, displayRelayUrl} from "@welshman/util"
+  import {sleep, once} from "@welshman/lib"
+  import {displayRelayUrl} from "@welshman/util"
   import {SocketStatus} from "@welshman/net"
   import Page from "@lib/components/Page.svelte"
   import Dialog from "@lib/components/Dialog.svelte"
@@ -19,10 +19,7 @@
     deriveRelayAuthError,
     relaysPendingTrust,
     deriveSocket,
-    userRoomsByUrl,
   } from "@app/core/state"
-  import {pullConservatively} from "@app/core/requests"
-  import {hasBlossomSupport} from "@app/core/commands"
   import {notifications} from "@app/util/notifications"
 
   type Props = {
@@ -33,8 +30,6 @@
 
   const url = decodeRelay($page.params.relay!)
 
-  const rooms = Array.from($userRoomsByUrl.get(url) || [])
-
   const socket = deriveSocket(url)
 
   const authError = deriveRelayAuthError(url)
@@ -56,8 +51,6 @@
   })
 
   onMount(() => {
-    const since = ago(MONTH)
-
     sleep(2000).then(() => {
       if ($socket.status !== SocketStatus.Open) {
         pushToast({
@@ -66,21 +59,6 @@
         })
       }
     })
-
-    // Prime our cache so we can upload images quicker
-    hasBlossomSupport(url)
-
-    // Load group meta, threads, calendar events, comments, and recent messages
-    // for user rooms to help with a quick page transition
-    pullConservatively({
-      relays: [url],
-      filters: [
-        {kinds: [ROOM_META]},
-        {kinds: [THREAD, EVENT_TIME, MESSAGE], since},
-        {kinds: [COMMENT], "#K": [String(THREAD), String(EVENT_TIME)], since},
-        ...rooms.map(room => ({kinds: [MESSAGE], "#h": [room], since})),
-      ],
-    })
   })
 </script>
 
diff --git a/src/routes/spaces/[relay]/[room]/+page.svelte b/src/routes/spaces/[relay]/[room]/+page.svelte
index 7b5fd658..16094fbf 100644
--- a/src/routes/spaces/[relay]/[room]/+page.svelte
+++ b/src/routes/spaces/[relay]/[room]/+page.svelte
@@ -6,19 +6,8 @@
   import type {Readable} from "svelte/store"
   import type {MakeNonOptional} from "@welshman/lib"
   import {now, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
-  import {request} from "@welshman/net"
   import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {
-    makeEvent,
-    makeRoomMeta,
-    MESSAGE,
-    DELETE,
-    THREAD,
-    EVENT_TIME,
-    ZAP_GOAL,
-    ROOM_ADD_USER,
-    ROOM_REMOVE_USER,
-  } from "@welshman/util"
+  import {makeEvent, makeRoomMeta, MESSAGE} from "@welshman/util"
   import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
   import {slide, fade, fly} from "@lib/transition"
   import Hashtag from "@assets/icons/hashtag.svg?dataurl"
@@ -43,11 +32,11 @@
     userRoomsByUrl,
     userSettingsValues,
     decodeRelay,
-    getEventsForUrl,
     deriveUserMembershipStatus,
     deriveChannel,
     MembershipStatus,
-    REACTION_KINDS,
+    PROTECTED,
+    MESSAGE_KINDS,
   } from "@app/core/state"
   import {setChecked, checked} from "@app/util/notifications"
   import {
@@ -57,7 +46,6 @@
     prependParent,
     publishDelete,
   } from "@app/core/commands"
-  import {PROTECTED} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
   import {popKey} from "@lib/implicit"
   import {pushToast} from "@app/util/toast"
@@ -68,7 +56,6 @@
   const lastChecked = $checked[$page.url.pathname]
   const url = decodeRelay(relay)
   const channel = deriveChannel(url, room)
-  const filter = {kinds: [MESSAGE, THREAD, EVENT_TIME, ZAP_GOAL], "#h": [room]}
   const isFavorite = $derived($userRoomsByUrl.get(url)?.has(room))
   const shouldProtect = canEnforceNip70(url)
   const membershipStatus = deriveUserMembershipStatus(url, room)
@@ -267,13 +254,9 @@
     cleanup?.()
 
     const feed = makeFeed({
+      url,
       element: element!,
-      relays: [url],
-      feedFilters: [filter],
-      subscriptionFilters: [
-        {kinds: [DELETE, MESSAGE, ...REACTION_KINDS], "#h": [room], since: now()},
-      ],
-      initialEvents: getEventsForUrl(url, [{...filter, limit: 20}]),
+      filters: [{kinds: MESSAGE_KINDS, "#h": [room]}],
       onExhausted: () => {
         loadingEvents = false
       },
@@ -301,21 +284,6 @@
   }
 
   onMount(() => {
-    const controller = new AbortController()
-
-    request({
-      signal: controller.signal,
-      relays: [url],
-      filters: [
-        {
-          kinds: [ROOM_ADD_USER, ROOM_REMOVE_USER],
-          "#p": [$pubkey!],
-          "#h": [room],
-          limit: 10,
-        },
-      ],
-    })
-
     const observer = new ResizeObserver(() => {
       if (dynamicPadding && chatCompose) {
         dynamicPadding!.style.minHeight = `${chatCompose!.offsetHeight}px`
@@ -327,7 +295,6 @@
     start()
 
     return () => {
-      controller.abort()
       observer.unobserve(chatCompose!)
       observer.unobserve(dynamicPadding!)
     }
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte
index 540acfb5..3dae6818 100644
--- a/src/routes/spaces/[relay]/calendar/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/+page.svelte
@@ -5,7 +5,7 @@
   import {page} from "$app/stores"
   import {now, last, formatTimestampAsDate} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {DELETE, EVENT_TIME, getTagValue} from "@welshman/util"
+  import {EVENT_TIME, getTagValue} from "@welshman/util"
   import {fly} from "@lib/transition"
   import CalendarMinimalistic from "@assets/icons/calendar-minimalistic.svg?dataurl"
   import CalendarAdd from "@assets/icons/calendar-add.svg?dataurl"
@@ -19,7 +19,7 @@
   import CalendarEventItem from "@app/components/CalendarEventItem.svelte"
   import CalendarEventCreate from "@app/components/CalendarEventCreate.svelte"
   import {pushModal} from "@app/util/modal"
-  import {getEventsForUrl, decodeRelay, REACTION_KINDS} from "@app/core/state"
+  import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {makeCalendarFeed} from "@app/core/requests"
   import {setChecked} from "@app/util/notifications"
 
@@ -31,7 +31,6 @@
 
   let element: HTMLElement | undefined = $state()
   let loading = $state(true)
-  let cleanup: () => void
   let events: Readable<TrustedEvent[]> = $state(readable([]))
 
   type Item = {
@@ -96,23 +95,20 @@
   })
 
   onMount(() => {
-    const feedFilters = [{kinds: [EVENT_TIME]}]
-    const subscriptionFilters = [{kinds: [DELETE, EVENT_TIME, ...REACTION_KINDS], since: now()}]
-
-    ;({events, cleanup} = makeCalendarFeed({
+    const feed = makeCalendarFeed({
+      url,
       element: element!,
-      relays: [url],
-      feedFilters,
-      subscriptionFilters,
-      initialEvents: getEventsForUrl(url, feedFilters),
+      filters: [{kinds: [EVENT_TIME]}, makeCommentFilter([EVENT_TIME])],
       onExhausted: () => {
         loading = false
       },
-    }))
+    })
+
+    events = feed.events
 
     return () => {
+      feed.cleanup()
       setChecked($page.url.pathname)
-      cleanup?.()
     }
   })
 </script>
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 7c5d8419..19a0d108 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import {onMount, onDestroy} from "svelte"
+  import {onMount} from "svelte"
   import {page} from "$app/stores"
   import type {Readable} from "svelte/store"
   import {readable} from "svelte/store"
   import {now, formatTimestampAsDate, MINUTE, ago} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {makeEvent, MESSAGE, DELETE, THREAD, EVENT_TIME, ZAP_GOAL} from "@welshman/util"
+  import {makeEvent, MESSAGE} from "@welshman/util"
   import {pubkey, publishThunk} from "@welshman/app"
   import {slide, fade, fly} from "@lib/transition"
   import ChatRound from "@assets/icons/chat-round.svg?dataurl"
@@ -21,13 +21,7 @@
   import ChannelItem from "@app/components/ChannelItem.svelte"
   import ChannelCompose from "@app/components/ChannelCompose.svelte"
   import ChannelComposeParent from "@app/components/ChannelComposeParent.svelte"
-  import {
-    userSettingsValues,
-    decodeRelay,
-    getEventsForUrl,
-    PROTECTED,
-    REACTION_KINDS,
-  } from "@app/core/state"
+  import {userSettingsValues, decodeRelay, MESSAGE_FILTER, PROTECTED} from "@app/core/state"
   import {prependParent, canEnforceNip70, publishDelete} from "@app/core/commands"
   import {setChecked, checked} from "@app/util/notifications"
   import {pushToast} from "@app/util/toast"
@@ -38,7 +32,6 @@
   const mounted = now()
   const lastChecked = $checked[$page.url.pathname]
   const url = decodeRelay($page.params.relay!)
-  const filter = {kinds: [MESSAGE, THREAD, EVENT_TIME, ZAP_GOAL]}
   const shouldProtect = canEnforceNip70(url)
 
   const replyTo = (event: TrustedEvent) => {
@@ -223,11 +216,9 @@
     observer.observe(dynamicPadding!)
 
     const feed = makeFeed({
+      url,
       element: element!,
-      relays: [url],
-      feedFilters: [filter],
-      subscriptionFilters: [{kinds: [DELETE, MESSAGE, ...REACTION_KINDS], since: now()}],
-      initialEvents: getEventsForUrl(url, [{...filter, limit: 20}]),
+      filters: [MESSAGE_FILTER],
       onExhausted: () => {
         loadingEvents = false
       },
@@ -237,20 +228,17 @@
     cleanup = feed.cleanup
 
     return () => {
+      cleanup()
       controller.abort()
       observer.unobserve(chatCompose!)
       observer.unobserve(dynamicPadding!)
+
+      // Sveltekit calls onDestroy at the beginning of the page load for some reason
+      setTimeout(() => {
+        setChecked($page.url.pathname)
+      }, 800)
     }
   })
-
-  onDestroy(() => {
-    cleanup?.()
-
-    // Sveltekit calls onDestroy at the beginning of the page load for some reason
-    setTimeout(() => {
-      setChecked($page.url.pathname)
-    }, 800)
-  })
 </script>
 
 <PageBar>
diff --git a/src/routes/spaces/[relay]/goals/+page.svelte b/src/routes/spaces/[relay]/goals/+page.svelte
index 0e9a69c7..3abb72ed 100644
--- a/src/routes/spaces/[relay]/goals/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/+page.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import {onMount} from "svelte"
+  import {readable} from "svelte/store"
+  import type {Readable} from "svelte/store"
   import {page} from "$app/stores"
-  import {sortBy, max, nthEq} from "@welshman/lib"
+  import {sortBy, partition, spec, pushToMapKey, max} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {ZAP_GOAL, DELETE, COMMENT, getListTags, getPubkeyTagValues} from "@welshman/util"
-  import {userMutes} from "@welshman/app"
+  import {ZAP_GOAL, getTagValue} from "@welshman/util"
   import {fly} from "@lib/transition"
   import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -15,61 +16,48 @@
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
   import GoalItem from "@app/components/GoalItem.svelte"
   import GoalCreate from "@app/components/GoalCreate.svelte"
-  import {decodeRelay, getEventsForUrl, REACTION_KINDS} from "@app/core/state"
+  import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {setChecked} from "@app/util/notifications"
   import {makeFeed} from "@app/core/requests"
   import {pushModal} from "@app/util/modal"
 
   const url = decodeRelay($page.params.relay!)
-  const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
-  const goals: TrustedEvent[] = $state([])
-  const comments: TrustedEvent[] = $state([])
 
   let loading = $state(true)
   let element: HTMLElement | undefined = $state()
+  let events: Readable<TrustedEvent[]> = $state(readable([]))
 
   const createGoal = () => pushModal(GoalCreate, {url})
 
-  const events = $derived.by(() => {
-    const scores = new Map<string, number>()
+  const items = $derived.by(() => {
+    const scores = new Map<string, number[]>()
+    const [goals, comments] = partition(spec({kind: ZAP_GOAL}), $events)
 
     for (const comment of comments) {
-      const id = comment.tags.find(nthEq(0, "E"))?.[1]
+      const id = getTagValue("E", comment.tags)
 
       if (id) {
-        scores.set(id, max([scores.get(id), comment.created_at]))
+        pushToMapKey(scores, id, comment.created_at)
       }
     }
 
-    return sortBy(e => -max([scores.get(e.id), e.created_at]), goals)
+    return sortBy(e => -max([...(scores.get(e.id) || []), e.created_at]), goals)
   })
 
   onMount(() => {
-    const {cleanup} = makeFeed({
+    const feed = makeFeed({
+      url,
       element: element!,
-      relays: [url],
-      feedFilters: [{kinds: [ZAP_GOAL, COMMENT]}],
-      subscriptionFilters: [
-        {kinds: [ZAP_GOAL, DELETE, ...REACTION_KINDS]},
-        {kinds: [COMMENT], "#K": [String(ZAP_GOAL)]},
-      ],
-      initialEvents: getEventsForUrl(url, [{kinds: [ZAP_GOAL, COMMENT], limit: 10}]),
-      onEvent: event => {
-        if (event.kind === ZAP_GOAL && !mutedPubkeys.includes(event.pubkey)) {
-          goals.push(event)
-        }
-
-        if (event.kind === COMMENT) {
-          comments.push(event)
-        }
-      },
+      filters: [{kinds: [ZAP_GOAL]}, makeCommentFilter([ZAP_GOAL])],
       onExhausted: () => {
         loading = false
       },
     })
 
+    events = feed.events
+
     return () => {
-      cleanup?.()
+      feed.cleanup()
       setChecked($page.url.pathname)
     }
   })
@@ -96,7 +84,7 @@
 </PageBar>
 
 <PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
-  {#each events as event (event.id)}
+  {#each items as event (event.id)}
     <div in:fly>
       <GoalItem {url} event={$state.snapshot(event)} />
     </div>
@@ -105,7 +93,7 @@
     <Spinner {loading}>
       {#if loading}
         Looking for goals...
-      {:else if events.length === 0}
+      {:else if items.length === 0}
         No goals found.
       {:else}
         That's all!
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/threads/+page.svelte
index 053f58d6..476148d8 100644
--- a/src/routes/spaces/[relay]/threads/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/+page.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import {onMount} from "svelte"
+  import {readable} from "svelte/store"
+  import type {Readable} from "svelte/store"
   import {page} from "$app/stores"
-  import {sortBy, max, nthEq} from "@welshman/lib"
+  import {sortBy, partition, spec, max, pushToMapKey} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {THREAD, DELETE, COMMENT, getListTags, getPubkeyTagValues} from "@welshman/util"
-  import {userMutes} from "@welshman/app"
+  import {THREAD, getTagValue} from "@welshman/util"
   import {fly} from "@lib/transition"
   import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -15,62 +16,49 @@
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
-  import {decodeRelay, getEventsForUrl} from "@app/core/state"
+  import {decodeRelay} from "@app/core/state"
   import {setChecked} from "@app/util/notifications"
-  import {REACTION_KINDS} from "@app/core/state"
+  import {makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
   import {pushModal} from "@app/util/modal"
 
   const url = decodeRelay($page.params.relay!)
-  const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
-  const threads: TrustedEvent[] = $state([])
-  const comments: TrustedEvent[] = $state([])
 
   let loading = $state(true)
   let element: HTMLElement | undefined = $state()
+  let events: Readable<TrustedEvent[]> = $state(readable([]))
 
   const createThread = () => pushModal(ThreadCreate, {url})
 
-  const events = $derived.by(() => {
-    const scores = new Map<string, number>()
+  const items = $derived.by(() => {
+    const scores = new Map<string, number[]>()
+    const [goals, comments] = partition(spec({kind: THREAD}), $events)
 
     for (const comment of comments) {
-      const id = comment.tags.find(nthEq(0, "E"))?.[1]
+      const id = getTagValue("E", comment.tags)
 
       if (id) {
-        scores.set(id, max([scores.get(id), comment.created_at]))
+        pushToMapKey(scores, id, comment.created_at)
       }
     }
 
-    return sortBy(e => -max([scores.get(e.id), e.created_at]), threads)
+    return sortBy(e => -max([...(scores.get(e.id) || []), e.created_at]), goals)
   })
 
   onMount(() => {
-    const {cleanup} = makeFeed({
+    const feed = makeFeed({
+      url,
       element: element!,
-      relays: [url],
-      feedFilters: [{kinds: [THREAD, COMMENT]}],
-      subscriptionFilters: [
-        {kinds: [THREAD, DELETE, ...REACTION_KINDS]},
-        {kinds: [COMMENT], "#K": [String(THREAD)]},
-      ],
-      initialEvents: getEventsForUrl(url, [{kinds: [THREAD, COMMENT], limit: 10}]),
-      onEvent: event => {
-        if (event.kind === THREAD && !mutedPubkeys.includes(event.pubkey)) {
-          threads.push(event)
-        }
-
-        if (event.kind === COMMENT) {
-          comments.push(event)
-        }
-      },
+      filters: [{kinds: [THREAD]}, makeCommentFilter([THREAD])],
       onExhausted: () => {
         loading = false
       },
     })
 
+    events = feed.events
+
     return () => {
-      cleanup?.()
+      feed.cleanup()
       setChecked($page.url.pathname)
     }
   })
@@ -97,7 +85,7 @@
 </PageBar>
 
 <PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
-  {#each events as event (event.id)}
+  {#each items as event (event.id)}
     <div in:fly>
       <ThreadItem {url} event={$state.snapshot(event)} />
     </div>
@@ -106,7 +94,7 @@
     <Spinner {loading}>
       {#if loading}
         Looking for threads...
-      {:else if events.length === 0}
+      {:else if items.length === 0}
         No threads found.
       {:else}
         That's all!