From 329ad507f6519414bc4283851e8f3e7bdc227b42 Mon Sep 17 00:00:00 2001
From: Bhavishy <bhavishyrocker2801@gmail.com>
Date: Thu, 2 Apr 2026 11:18:41 +0530
Subject: [PATCH 1/3] feat: use NIP-50 relay-side search with scope selection

---
 src/app/components/SpaceSearch.svelte | 137 ++++++++++++++++++++++----
 1 file changed, 117 insertions(+), 20 deletions(-)

diff --git a/src/app/components/SpaceSearch.svelte b/src/app/components/SpaceSearch.svelte
index c5557bcb..f25313fe 100644
--- a/src/app/components/SpaceSearch.svelte
+++ b/src/app/components/SpaceSearch.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
   import {tick} from "svelte"
-  import {createSearch} from "@welshman/app"
-  import {formatTimestampAsDate, groupBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
-  import type {TrustedEvent} from "@welshman/util"
-  import {MESSAGE} from "@welshman/util"
+  import {debounce} from "throttle-debounce"
+  import {request} from "@welshman/net"
+  import {userSearchRelayList} from "@welshman/app"
+  import {formatTimestampAsDate, groupBy, now, uniqBy, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
+  import type {TrustedEvent, Filter} from "@welshman/util"
+  import {getRelaysFromList, MESSAGE, sortEventsDesc} from "@welshman/util"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
   import {fly} from "@lib/transition"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {deriveEventsForUrl} from "@app/core/state"
+  import {DEFAULT_RELAYS} from "@app/core/state"
   import {goToEvent} from "@app/util/routes"
 
   type Props = {
@@ -19,14 +21,34 @@
 
   const {url, h}: Props = $props()
 
-  const spaceMessages = deriveEventsForUrl(
-    url,
-    h ? [{kinds: [MESSAGE], "#h": [h]}] : [{kinds: [MESSAGE]}],
-  )
+  type SearchScope = "room" | "space" | "everything"
+
+  const scopes: SearchScope[] = h ? ["room", "space", "everything"] : ["space", "everything"]
 
   let term = $state("")
   let show = $state(false)
+  let scope = $state<SearchScope>(h ? "room" : "space")
+  let results = $state<TrustedEvent[]>([])
+  let loading = $state(false)
   let input: HTMLInputElement | undefined = $state()
+  let currentSearchId = 0
+  let controller: AbortController | undefined
+
+  const searchRelayUrls = $derived(getRelaysFromList($userSearchRelayList))
+  const effectiveEverythingRelays = $derived(
+    uniqBy(identity => identity, searchRelayUrls).length > 0
+      ? uniqBy(identity => identity, searchRelayUrls)
+      : DEFAULT_RELAYS,
+  )
+  const relayStatus = $derived(
+    scope === "room"
+      ? `Using space relay: ${url} (room filter applied).`
+      : scope === "space"
+        ? `Using space relay: ${url}.`
+        : searchRelayUrls.length > 0
+          ? `Using your search relays (${effectiveEverythingRelays.length}).`
+          : `Using default relays (${effectiveEverythingRelays.length}) because no search relays are configured.`,
+  )
 
   const open = () => {
     show = true
@@ -40,20 +62,75 @@
   const clear = () => {
     term = ""
     show = false
+    loading = false
+    results = []
+    controller?.abort()
+    controller = undefined
   }
 
+  const getRelayUrls = () => {
+    if (scope === "everything") {
+      return effectiveEverythingRelays
+    }
+
+    return [url]
+  }
+
+  const getFilter = (searchTerm: string): Filter => {
+    if (scope === "room" && h) {
+      return {kinds: [MESSAGE], "#h": [h], search: searchTerm}
+    }
+
+    return {kinds: [MESSAGE], search: searchTerm}
+  }
+
+  const search = debounce(300, async (searchTerm: string, searchId: number) => {
+    controller?.abort()
+
+    if (!searchTerm.trim()) {
+      loading = false
+      results = []
+      return
+    }
+
+    controller = new AbortController()
+    loading = true
+
+    try {
+      const events = await request({
+        relays: getRelayUrls(),
+        autoClose: true,
+        signal: controller.signal,
+        filters: [getFilter(searchTerm.trim())],
+      })
+
+      if (searchId === currentSearchId) {
+        results = sortEventsDesc(uniqBy((event: TrustedEvent) => event.id, events))
+      }
+    } catch (error) {
+      if (
+        !(error instanceof DOMException && error.name === "AbortError") &&
+        searchId === currentSearchId
+      ) {
+        results = []
+      }
+    } finally {
+      if (searchId === currentSearchId) {
+        loading = false
+      }
+    }
+  })
+
   const onInput = () => {
-    show = true
+    currentSearchId += 1
+    void search(term, currentSearchId)
   }
 
-  const searchIndex = $derived.by(() =>
-    createSearch($spaceMessages, {
-      getValue: event => event.id,
-      fuseOptions: {keys: ["content"]},
-    }),
-  )
-
-  const results = $derived(term ? searchIndex.searchOptions(term) : [])
+  const setScope = (value: SearchScope) => {
+    scope = value
+    currentSearchId += 1
+    void search(term, currentSearchId)
+  }
 
   const eventsByAge = $derived(groupBy(e => getAgeSection(e.created_at), results))
 
@@ -118,14 +195,34 @@
             bind:value={term}
             class="min-w-0 grow"
             type="text"
-            placeholder={h ? "Search this room..." : "Search this space..."}
+            placeholder={scope === "room"
+              ? "Search this room..."
+              : scope === "space"
+                ? "Search this space..."
+                : "Search everything..."}
             oninput={onInput} />
         </label>
+        <div class="flex flex-wrap gap-1">
+          {#each scopes as value (value)}
+            <Button
+              class={value === scope ? "btn btn-neutral btn-xs" : "btn btn-ghost btn-xs"}
+              onclick={() => setScope(value)}>
+              {value === "room" ? "Room" : value === "space" ? "Space" : "Everything"}
+            </Button>
+          {/each}
+        </div>
         <div class="max-h-[65vh] overflow-y-auto">
+          <p class="mb-2 text-xs opacity-70">{relayStatus}</p>
           {#if !term}
             <p class="text-sm opacity-70">
-              {h ? "Search for messages in this room." : "Search for messages across this space."}
+              {scope === "room"
+                ? "Search for messages in this room."
+                : scope === "space"
+                  ? "Search for messages in this space."
+                  : "Search across your configured search relays."}
             </p>
+          {:else if loading}
+            <p class="text-sm opacity-70">Searching...</p>
           {:else if eventsByAge.size === 0}
             <p class="text-sm opacity-70">No results found.</p>
           {:else}
-- 
2.52.0


From 8990a205d28f9fd4d9747094b9051c361facc1c5 Mon Sep 17 00:00:00 2001
From: Bhavishy <bhavishyrocker2801@gmail.com>
Date: Thu, 2 Apr 2026 23:42:48 +0530
Subject: [PATCH 2/3] fix: query content kinds via NIP-50 in room and space
 search

---
 src/app/components/SpaceSearch.svelte | 71 +++++++--------------------
 1 file changed, 19 insertions(+), 52 deletions(-)

diff --git a/src/app/components/SpaceSearch.svelte b/src/app/components/SpaceSearch.svelte
index f25313fe..687555ad 100644
--- a/src/app/components/SpaceSearch.svelte
+++ b/src/app/components/SpaceSearch.svelte
@@ -2,16 +2,15 @@
   import {tick} from "svelte"
   import {debounce} from "throttle-debounce"
   import {request} from "@welshman/net"
-  import {userSearchRelayList} from "@welshman/app"
-  import {formatTimestampAsDate, groupBy, now, uniqBy, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
+  import {formatTimestampAsDate, groupBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
   import type {TrustedEvent, Filter} from "@welshman/util"
-  import {getRelaysFromList, MESSAGE, sortEventsDesc} from "@welshman/util"
+  import {sortEventsDesc} from "@welshman/util"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
   import {fly} from "@lib/transition"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {DEFAULT_RELAYS} from "@app/core/state"
+  import {CONTENT_KINDS} from "@app/core/state"
   import {goToEvent} from "@app/util/routes"
 
   type Props = {
@@ -21,9 +20,9 @@
 
   const {url, h}: Props = $props()
 
-  type SearchScope = "room" | "space" | "everything"
+  type SearchScope = "room" | "space"
 
-  const scopes: SearchScope[] = h ? ["room", "space", "everything"] : ["space", "everything"]
+  const scopes: SearchScope[] = h ? ["room", "space"] : ["space"]
 
   let term = $state("")
   let show = $state(false)
@@ -31,23 +30,12 @@
   let results = $state<TrustedEvent[]>([])
   let loading = $state(false)
   let input: HTMLInputElement | undefined = $state()
-  let currentSearchId = 0
   let controller: AbortController | undefined
 
-  const searchRelayUrls = $derived(getRelaysFromList($userSearchRelayList))
-  const effectiveEverythingRelays = $derived(
-    uniqBy(identity => identity, searchRelayUrls).length > 0
-      ? uniqBy(identity => identity, searchRelayUrls)
-      : DEFAULT_RELAYS,
-  )
   const relayStatus = $derived(
     scope === "room"
       ? `Using space relay: ${url} (room filter applied).`
-      : scope === "space"
-        ? `Using space relay: ${url}.`
-        : searchRelayUrls.length > 0
-          ? `Using your search relays (${effectiveEverythingRelays.length}).`
-          : `Using default relays (${effectiveEverythingRelays.length}) because no search relays are configured.`,
+      : `Using space relay: ${url}.`,
   )
 
   const open = () => {
@@ -68,23 +56,17 @@
     controller = undefined
   }
 
-  const getRelayUrls = () => {
-    if (scope === "everything") {
-      return effectiveEverythingRelays
-    }
-
-    return [url]
-  }
+  const getRelayUrls = () => [url]
 
   const getFilter = (searchTerm: string): Filter => {
     if (scope === "room" && h) {
-      return {kinds: [MESSAGE], "#h": [h], search: searchTerm}
+      return {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
     }
 
-    return {kinds: [MESSAGE], search: searchTerm}
+    return {kinds: CONTENT_KINDS, search: searchTerm}
   }
 
-  const search = debounce(300, async (searchTerm: string, searchId: number) => {
+  const search = debounce(300, async (searchTerm: string) => {
     controller?.abort()
 
     if (!searchTerm.trim()) {
@@ -104,32 +86,23 @@
         filters: [getFilter(searchTerm.trim())],
       })
 
-      if (searchId === currentSearchId) {
-        results = sortEventsDesc(uniqBy((event: TrustedEvent) => event.id, events))
-      }
+      results = sortEventsDesc(events)
     } catch (error) {
-      if (
-        !(error instanceof DOMException && error.name === "AbortError") &&
-        searchId === currentSearchId
-      ) {
+      if (!(error instanceof DOMException && error.name === "AbortError")) {
         results = []
       }
     } finally {
-      if (searchId === currentSearchId) {
-        loading = false
-      }
+      loading = false
     }
   })
 
   const onInput = () => {
-    currentSearchId += 1
-    void search(term, currentSearchId)
+    void search(term)
   }
 
   const setScope = (value: SearchScope) => {
     scope = value
-    currentSearchId += 1
-    void search(term, currentSearchId)
+    void search(term)
   }
 
   const eventsByAge = $derived(groupBy(e => getAgeSection(e.created_at), results))
@@ -195,11 +168,7 @@
             bind:value={term}
             class="min-w-0 grow"
             type="text"
-            placeholder={scope === "room"
-              ? "Search this room..."
-              : scope === "space"
-                ? "Search this space..."
-                : "Search everything..."}
+            placeholder={scope === "room" ? "Search this room..." : "Search this space..."}
             oninput={onInput} />
         </label>
         <div class="flex flex-wrap gap-1">
@@ -207,7 +176,7 @@
             <Button
               class={value === scope ? "btn btn-neutral btn-xs" : "btn btn-ghost btn-xs"}
               onclick={() => setScope(value)}>
-              {value === "room" ? "Room" : value === "space" ? "Space" : "Everything"}
+              {value === "room" ? "Room" : "Space"}
             </Button>
           {/each}
         </div>
@@ -216,10 +185,8 @@
           {#if !term}
             <p class="text-sm opacity-70">
               {scope === "room"
-                ? "Search for messages in this room."
-                : scope === "space"
-                  ? "Search for messages in this space."
-                  : "Search across your configured search relays."}
+                ? "Search for content in this room."
+                : "Search for content in this space."}
             </p>
           {:else if loading}
             <p class="text-sm opacity-70">Searching...</p>
-- 
2.52.0


From 63b1cd125e52b33c1673885b3495a7705a73a8bd Mon Sep 17 00:00:00 2001
From: Bhavishy <bhavishyrocker2801@gmail.com>
Date: Thu, 2 Apr 2026 23:56:02 +0530
Subject: [PATCH 3/3] make contextual search h-based again

---
 src/app/components/SpaceSearch.svelte | 40 +++++----------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/app/components/SpaceSearch.svelte b/src/app/components/SpaceSearch.svelte
index 687555ad..b1143fec 100644
--- a/src/app/components/SpaceSearch.svelte
+++ b/src/app/components/SpaceSearch.svelte
@@ -20,22 +20,15 @@
 
   const {url, h}: Props = $props()
 
-  type SearchScope = "room" | "space"
-
-  const scopes: SearchScope[] = h ? ["room", "space"] : ["space"]
-
   let term = $state("")
   let show = $state(false)
-  let scope = $state<SearchScope>(h ? "room" : "space")
   let results = $state<TrustedEvent[]>([])
   let loading = $state(false)
   let input: HTMLInputElement | undefined = $state()
   let controller: AbortController | undefined
 
   const relayStatus = $derived(
-    scope === "room"
-      ? `Using space relay: ${url} (room filter applied).`
-      : `Using space relay: ${url}.`,
+    h ? `Searching this room on relay: ${url}.` : `Searching this space on relay: ${url}.`,
   )
 
   const open = () => {
@@ -58,13 +51,10 @@
 
   const getRelayUrls = () => [url]
 
-  const getFilter = (searchTerm: string): Filter => {
-    if (scope === "room" && h) {
-      return {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
-    }
-
-    return {kinds: CONTENT_KINDS, search: searchTerm}
-  }
+  const getFilter = (searchTerm: string): Filter =>
+    h
+      ? {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
+      : {kinds: CONTENT_KINDS, search: searchTerm}
 
   const search = debounce(300, async (searchTerm: string) => {
     controller?.abort()
@@ -100,11 +90,6 @@
     void search(term)
   }
 
-  const setScope = (value: SearchScope) => {
-    scope = value
-    void search(term)
-  }
-
   const eventsByAge = $derived(groupBy(e => getAgeSection(e.created_at), results))
 
   const getAgeSection = (createdAt: number) => {
@@ -168,25 +153,14 @@
             bind:value={term}
             class="min-w-0 grow"
             type="text"
-            placeholder={scope === "room" ? "Search this room..." : "Search this space..."}
+            placeholder={h ? "Search this room..." : "Search this space..."}
             oninput={onInput} />
         </label>
-        <div class="flex flex-wrap gap-1">
-          {#each scopes as value (value)}
-            <Button
-              class={value === scope ? "btn btn-neutral btn-xs" : "btn btn-ghost btn-xs"}
-              onclick={() => setScope(value)}>
-              {value === "room" ? "Room" : "Space"}
-            </Button>
-          {/each}
-        </div>
         <div class="max-h-[65vh] overflow-y-auto">
           <p class="mb-2 text-xs opacity-70">{relayStatus}</p>
           {#if !term}
             <p class="text-sm opacity-70">
-              {scope === "room"
-                ? "Search for content in this room."
-                : "Search for content in this space."}
+              {h ? "Search for content in this room." : "Search for content in this space."}
             </p>
           {:else if loading}
             <p class="text-sm opacity-70">Searching...</p>
-- 
2.52.0