From c77197d959bb27bd460f235930498823ed8c558d Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 18 Feb 2026 11:01:28 -0800
Subject: [PATCH] Continue working on feed page

---
 src/app/components/EventReducer.svelte        | 131 ------------------
 src/routes/home/+page.svelte                  |  11 +-
 src/routes/home/feed/[address]/+layout.svelte |  14 ++
 src/routes/home/feed/[address]/+page.svelte   |   1 +
 4 files changed, 24 insertions(+), 133 deletions(-)
 delete mode 100644 src/app/components/EventReducer.svelte
 create mode 100644 src/routes/home/feed/[address]/+layout.svelte

diff --git a/src/app/components/EventReducer.svelte b/src/app/components/EventReducer.svelte
deleted file mode 100644
index a7d36c200..000000000
--- a/src/app/components/EventReducer.svelte
+++ /dev/null
@@ -1,131 +0,0 @@
-<script lang="ts">
-  import {insertAt, lt, addToMapKey, parseJson} from "@welshman/lib"
-  import type {TrustedEvent} from "@welshman/util"
-  import {Router, addMaximalFallbacks} from "@welshman/router"
-  import {load} from "@welshman/net"
-  import {
-    getIdOrAddress,
-    getIdFilters,
-    getParentIdsAndAddrs,
-    getParentIdOrAddr,
-    verifyEvent,
-    ZAP_RESPONSE,
-  } from "@welshman/util"
-  import {repository, getValidZap} from "@welshman/app"
-  import {REPOST_KINDS, REACTION_KINDS, isEventMuted} from '@app/core/state'
-
-  export let events: TrustedEvent[]
-  export let depth = 0
-  export let showMuted = false
-  export let hideReplies = false
-  export let showDeleted = false
-  export let shouldSort = false
-  export let shouldAwait = false
-  export let items: TrustedEvent[] = []
-
-  const timestamps = new Map<string, number>()
-  const context = new Map<string, Set<TrustedEvent>>()
-
-  const shouldSkip = (event: TrustedEvent) => {
-    if (!showMuted && $isEventMuted(event)) return true
-    if (!showDeleted && repository.isDeleted(event)) return true
-    if (hideReplies && getParentIdOrAddr(event)) return true
-    if (timestamps.has(getIdOrAddress(event))) return true
-
-    return false
-  }
-
-  const getParent = async (event: TrustedEvent) => {
-    if (REPOST_KINDS.includes(event.kind)) {
-      const parent = parseJson(event.content)
-
-      if (parent && verifyEvent(parent)) {
-        return parent
-      }
-    }
-
-    const parentIds = getParentIdsAndAddrs(event)
-
-    if (parentIds.length > 0) {
-      const filters = getIdFilters(parentIds)
-      const [cached] = repository.query(filters)
-
-      if (cached) return cached
-
-      const relays = Router.get().EventParents(event).policy(addMaximalFallbacks).getUrls()
-      const [parent] = await load({filters, relays})
-
-      return parent
-    }
-  }
-
-  const addEvent = async (event: TrustedEvent) => {
-    const original = event
-    let currentDepth = depth
-
-    timestamps.set(getIdOrAddress(event), original.created_at)
-
-    while (currentDepth > 0) {
-      const parent = await getParent(event)
-
-      // Unable to get the parent? we're done traversing parents
-      if (!parent) {
-        break
-      }
-
-      // Skip zaps that fail our zapper check
-      if (event.kind === ZAP_RESPONSE && !(await getValidZap(event, parent))) {
-        return
-      }
-
-      // Link the events, even if we end up skipping this one (since we deduplicate)
-      addToMapKey(context, getIdOrAddress(parent), event)
-
-      // Hide replies to deleted/muted parents, or parents we've already seen
-      if (shouldSkip(parent)) {
-        return
-      }
-
-      timestamps.set(getIdOrAddress(parent), original.created_at)
-      currentDepth--
-      event = parent
-    }
-
-    // If it's not displayable, skip it
-    if ([...REPOST_KINDS, ...REACTION_KINDS].includes(event.kind)) return
-
-    let inserted = false
-
-    if (shouldSort) {
-      for (let i = 0; i < items.length; i++) {
-        if (lt(timestamps.get(getIdOrAddress(items[i])), original.created_at)) {
-          items = insertAt(i, event, items)
-          inserted = true
-          break
-        }
-      }
-    }
-
-    if (!inserted) {
-      items = [...items, event]
-    }
-  }
-
-  const addEvents = async (events: TrustedEvent[]) => {
-    for (const event of events) {
-      if (!shouldSkip(event)) {
-        const promise = addEvent(event)
-
-        if (shouldAwait) {
-          await promise
-        }
-      }
-    }
-  }
-
-  $: addEvents(events)
-</script>
-
-{#each items as event, i (event.id)}
-  {@render children({i, event})}
-{/each}
diff --git a/src/routes/home/+page.svelte b/src/routes/home/+page.svelte
index 4a8e7e280..863ceccde 100644
--- a/src/routes/home/+page.svelte
+++ b/src/routes/home/+page.svelte
@@ -36,7 +36,7 @@
   import GoalItem from "@app/components/GoalItem.svelte"
   import CalendarEventItem from "@app/components/CalendarEventItem.svelte"
   import RecentConversation from "@app/components/RecentConversation.svelte"
-  import {makeRoomId, userSpaceUrls, loadUserGroupList, CONTENT_KINDS} from "@app/core/state"
+  import {makeRoomId, userSpaceUrls, loadUserGroupList, isEventMuted, CONTENT_KINDS} from "@app/core/state"
 
   type Activity = {
     type: "message" | "content"
@@ -130,7 +130,14 @@
           makeIntersectionFeed(makeScopeFeed(Scope.Follows), makeKindFeed(NOTE)),
         ),
         onEvent: batch(100, (evts: TrustedEvent[]) => {
-          events.update($events => [...$events, ...evts.filter(e => !getParentIdOrAddr(e))])
+          const keep = evts.filter(event => {
+            if ($isEventMuted(event)) return false
+            if (getParentIdOrAddr(event)) return false
+
+            return true
+          })
+
+          events.update($events => [...$events, ...keep])
         }),
         onExhausted: () => {
           loading = false
diff --git a/src/routes/home/feed/[address]/+layout.svelte b/src/routes/home/feed/[address]/+layout.svelte
new file mode 100644
index 000000000..a37a29166
--- /dev/null
+++ b/src/routes/home/feed/[address]/+layout.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  import type {Snippet} from "svelte"
+  import {page} from "$app/stores"
+
+  type Props = {
+    children: Snippet
+  }
+
+  const {children}: Props = $props()
+</script>
+
+{#key $page.params.addres}
+  {@render children()}
+{/key}
diff --git a/src/routes/home/feed/[address]/+page.svelte b/src/routes/home/feed/[address]/+page.svelte
index 892be43a9..e79208da0 100644
--- a/src/routes/home/feed/[address]/+page.svelte
+++ b/src/routes/home/feed/[address]/+page.svelte
@@ -13,6 +13,7 @@
   import {deriveFeed} from "@app/core/state"
 
   const {address} = $page.params as MakeNonOptional<typeof $page.params>
+  console.log(address)
   const events = writable<TrustedEvent[]>([])
   const controller = new AbortController()
   const feed = deriveFeed(address)