Use welshman kinds

src/routes/+layout.svelte

@@ -15,6 +15,9 @@
     RELAYS,
     INBOX_RELAYS,
     WRAP,
+    MESSAGE,
+    COMMENT,
+    THREAD,
     getPubkeyTagValues,
     getListTags,
   } from "@welshman/util"
@@ -55,9 +58,6 @@
     userMembership,
     ensureUnwrapped,
     canDecrypt,
-    MESSAGE,
-    COMMENT,
-    THREAD,
     GENERAL,
   } from "@app/state"
   import {loadUserData, subscribePersistent} from "@app/commands"

src/routes/spaces/[relay]/+layout.svelte

@@ -3,7 +3,7 @@
   import {page} from "$app/stores"
   import {now} from "@welshman/lib"
   import {subscribe} from "@welshman/app"
-  import {DELETE, REACTION} from "@welshman/util"
+  import {DELETE, REACTION, GROUPS} from "@welshman/util"
   import Page from "@lib/components/Page.svelte"
   import SecondaryNav from "@lib/components/SecondaryNav.svelte"
   import MenuSpace from "@app/components/MenuSpace.svelte"
@@ -12,7 +12,7 @@
   import {pushModal} from "@app/modal"
   import {setChecked} from "@app/notifications"
   import {checkRelayConnection, checkRelayAuth, checkRelayAccess} from "@app/commands"
-  import {decodeRelay, MEMBERSHIPS} from "@app/state"
+  import {decodeRelay} from "@app/state"
   import {deriveNotification, SPACE_FILTERS} from "@app/notifications"
 
   const url = decodeRelay($page.params.relay)
@@ -47,7 +47,7 @@
 
     const sub = subscribe({
       relays: [url],
-      filters: [{kinds: [MEMBERSHIPS]}, {kinds: [DELETE, REACTION], since: now()}],
+      filters: [{kinds: [GROUPS]}, {kinds: [DELETE, REACTION], since: now()}],
     })
 
     return () => {

src/routes/spaces/[relay]/[room]/+page.svelte

@@ -8,7 +8,7 @@
   import {sleep, now, ctx} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {throttled} from "@welshman/store"
-  import {createEvent, DELETE} from "@welshman/util"
+  import {createEvent, DELETE, MESSAGE} from "@welshman/util"
   import {PublishStatus} from "@welshman/net"
   import {formatTimestampAsDate, load, publishThunk, deriveRelay} from "@welshman/app"
   import {slide} from "@lib/transition"
@@ -30,7 +30,6 @@
     deriveChannelMessages,
     GENERAL,
     tagRoom,
-    MESSAGE,
     LEGACY_MESSAGE,
     getMembershipRoomsByUrl,
   } from "@app/state"

src/routes/spaces/[relay]/threads/+page.svelte

@@ -3,7 +3,7 @@
   import {derived} from "svelte/store"
   import {page} from "$app/stores"
   import {sortBy, min, nthEq, sleep} from "@welshman/lib"
-  import {getListTags, getPubkeyTagValues} from "@welshman/util"
+  import {getListTags, getPubkeyTagValues, THREAD, COMMENT} from "@welshman/util"
   import {throttled} from "@welshman/store"
   import {feedsFromFilters, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
   import {createFeedController, userMutes} from "@welshman/app"
@@ -16,7 +16,7 @@
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
-  import {THREAD, LEGACY_THREAD, COMMENT, decodeRelay, deriveEventsForUrl} from "@app/state"
+  import {LEGACY_THREAD, decodeRelay, deriveEventsForUrl} from "@app/state"
   import {THREAD_FILTERS, setChecked} from "@app/notifications"
   import {pushModal} from "@app/modal"
 

src/routes/spaces/[relay]/threads/[id]/+page.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {sortBy, nthEq, sleep} from "@welshman/lib"
   import {page} from "$app/stores"
+  import {sortBy, nthEq, sleep} from "@welshman/lib"
+  import {COMMENT} from "@welshman/util"
   import {repository} from "@welshman/app"
   import {deriveEvents} from "@welshman/store"
   import Icon from "@lib/components/Icon.svelte"
@@ -13,7 +14,7 @@
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
   import ThreadActions from "@app/components/ThreadActions.svelte"
   import ThreadReply from "@app/components/ThreadReply.svelte"
-  import {COMMENT, deriveEvent, decodeRelay} from "@app/state"
+  import {deriveEvent, decodeRelay} from "@app/state"
   import {subscribePersistent} from "@app/commands"
   import {setChecked} from "@app/notifications"