From cce576123541971d217bdc83d7f1c772798709e7 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Thu, 24 Oct 2024 13:48:44 -0700
Subject: [PATCH] Switch to kind 309 for threads

---
 src/app/components/ThreadCreate.svelte   |  5 +++--
 src/app/state.ts                         |  2 ++
 src/routes/spaces/[relay]/+layout.svelte |  6 +++---
 src/routes/spaces/[relay]/+page.svelte   | 12 +++++++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index 307f642..8698198 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -3,13 +3,14 @@
   import type {Readable} from "svelte/store"
   import {writable} from "svelte/store"
   import {createEditor, type Editor, EditorContent} from "svelte-tiptap"
-  import {createEvent, NOTE} from "@welshman/util"
+  import {createEvent} from "@welshman/util"
   import {publishThunk} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {pushToast} from '@app/toast'
+  import {THREAD} from "@app/state"
   import {getPubkeyHints} from "@app/commands"
   import {getEditorOptions, addFile, uploadFiles, getEditorTags} from "@lib/editor"
 
@@ -33,7 +34,7 @@
     }
 
     publishThunk({
-      event: createEvent(NOTE, {content, tags}),
+      event: createEvent(THREAD, {content, tags}),
       relays: [url],
     })
 
diff --git a/src/app/state.ts b/src/app/state.ts
index 0ef43f7..8a1fbb1 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -66,6 +66,8 @@ export const GENERAL = "general"
 
 export const MESSAGE = 209
 
+export const THREAD = 309
+
 export const COMMENT = 1111
 
 export const MEMBERSHIPS = 10209
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index 56c502b..6963fc1 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -2,19 +2,19 @@
   import {onMount} from "svelte"
   import {page} from "$app/stores"
   import {subscribe} from "@welshman/app"
-  import {DELETE, NOTE} from "@welshman/util"
+  import {DELETE} from "@welshman/util"
   import Page from "@lib/components/Page.svelte"
   import Delay from "@lib/components/Delay.svelte"
   import SecondaryNav from "@lib/components/SecondaryNav.svelte"
   import MenuSpace from "@app/components/MenuSpace.svelte"
-  import {decodeRelay, MEMBERSHIPS, MESSAGE, COMMENT} from "@app/state"
+  import {decodeRelay, MEMBERSHIPS, THREAD, MESSAGE, COMMENT} from "@app/state"
 
   $: url = decodeRelay($page.params.relay)
 
   onMount(() => {
     const sub = subscribe({
       filters: [
-        {kinds: [DELETE], "#k": [NOTE, COMMENT, MESSAGE].map(String)},
+        {kinds: [DELETE], "#k": [THREAD, COMMENT, MESSAGE].map(String)},
         {kinds: [MEMBERSHIPS], "#r": [url]},
       ],
       relays: [url],
diff --git a/src/routes/spaces/[relay]/+page.svelte b/src/routes/spaces/[relay]/+page.svelte
index 784fcd2..9a143e5 100644
--- a/src/routes/spaces/[relay]/+page.svelte
+++ b/src/routes/spaces/[relay]/+page.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {page} from "$app/stores"
-  import {NOTE, getListTags, getPubkeyTagValues} from "@welshman/util"
-  import {feedFromFilter, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
+  import {getListTags, getPubkeyTagValues} from "@welshman/util"
+  import type {Filter} from "@welshman/util"
+  import {feedsFromFilters, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
   import {nthEq} from "@welshman/lib"
   import {feedLoader, userMutes} from "@welshman/app"
   import {createScroller} from "@lib/html"
@@ -13,13 +14,14 @@
   import MenuSpace from "@app/components/MenuSpace.svelte"
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
-  import {COMMENT, deriveEventsForUrl, decodeRelay} from "@app/state"
+  import {THREAD, COMMENT, deriveEventsForUrl, decodeRelay} from "@app/state"
   import {pushModal, pushDrawer} from "@app/modal"
 
   const url = decodeRelay($page.params.relay)
-  const events = deriveEventsForUrl(url, [NOTE])
+  const events = deriveEventsForUrl(url, [THREAD])
   const mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
-  const feed = makeIntersectionFeed(makeRelayFeed(url), feedFromFilter({kinds: [NOTE, COMMENT]}))
+  const filters: Filter[] = [{kinds: [THREAD]}, {kinds: [COMMENT], '#k': [String(THREAD)]}]
+  const feed = makeIntersectionFeed(makeRelayFeed(url), feedsFromFilters(filters))
   const loader = feedLoader.getLoader(feed, {
     onExhausted: () => {
       loading = false