From e1a7b051bd870e2e2b3354e388208f1768bd8062 Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Thu, 16 Apr 2026 11:30:59 -0700
Subject: [PATCH] Use welshman kinds

---
 package.json                                  |  20 +++++------
 pnpm-lock.yaml                                | Bin 368357 -> 368357 bytes
 src/app/components/NoteContent.svelte         |   5 ++-
 src/app/components/NoteContentMinimal.svelte  |   5 ++-
 .../components/NoteContentMinimalPoll.svelte  |   4 +--
 src/app/components/NoteContentPoll.svelte     |   4 +--
 src/app/components/PollCreate.svelte          |   5 ++-
 src/app/components/PollVotes.svelte           |   4 +--
 src/app/components/ProfileEdit.svelte         |  16 +++------
 src/app/components/ProfileEditForm.svelte     |  23 +-----------
 src/app/components/SignUpProfile.svelte       |   2 +-
 src/app/components/SpaceMenu.svelte           |   5 ++-
 src/app/core/commands.ts                      |  34 +++++-------------
 src/app/core/state.ts                         |   4 +--
 src/app/core/sync.ts                          |   4 +--
 src/app/util/routes.ts                        |   6 ++--
 src/routes/spaces/[relay]/polls/+page.svelte  |   7 ++--
 .../spaces/[relay]/polls/[id]/+page.svelte    |   5 ++-
 src/routes/spaces/[relay]/recent/+page.svelte |   4 +--
 19 files changed, 53 insertions(+), 104 deletions(-)

diff --git a/package.json b/package.json
index 2a7249f4..3f386dea 100644
--- a/package.json
+++ b/package.json
@@ -70,16 +70,16 @@
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^0.2.6",
     "@vite-pwa/sveltekit": "^0.6.8",
-    "@welshman/app": "^0.8.12",
-    "@welshman/content": "^0.8.12",
-    "@welshman/editor": "^0.8.12",
-    "@welshman/feeds": "^0.8.12",
-    "@welshman/lib": "^0.8.12",
-    "@welshman/net": "^0.8.12",
-    "@welshman/router": "^0.8.12",
-    "@welshman/signer": "^0.8.12",
-    "@welshman/store": "^0.8.12",
-    "@welshman/util": "^0.8.12",
+    "@welshman/app": "^0.8.13",
+    "@welshman/content": "^0.8.13",
+    "@welshman/editor": "^0.8.13",
+    "@welshman/feeds": "^0.8.13",
+    "@welshman/lib": "^0.8.13",
+    "@welshman/net": "^0.8.13",
+    "@welshman/router": "^0.8.13",
+    "@welshman/signer": "^0.8.13",
+    "@welshman/store": "^0.8.13",
+    "@welshman/util": "^0.8.13",
     "compressorjs-next": "^1.1.2",
     "daisyui": "^5.5.19",
     "date-picker-svelte": "^2.17.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1473dd50d52424013be01739f31ba2f0344daf10..e02625b713598c90c44d193ae517a08acb4a5d76 100644
GIT binary patch
delta 3488
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
DM7~(O

delta 3509
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

diff --git a/src/app/components/NoteContent.svelte b/src/app/components/NoteContent.svelte
index 8eca0dd9..dd9126bf 100644
--- a/src/app/components/NoteContent.svelte
+++ b/src/app/components/NoteContent.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
-  import {Poll} from "nostr-tools/kinds"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
   import NoteContentEventTime from "@app/components/NoteContentEventTime.svelte"
   import NoteContentThread from "@app/components/NoteContentThread.svelte"
   import NoteContentClassified from "@app/components/NoteContentClassified.svelte"
@@ -21,7 +20,7 @@
     <NoteContentClassified {...props} />
   {:else if props.event.kind === ZAP_GOAL}
     <NoteContentGoal {...props} />
-  {:else if props.event.kind === Poll}
+  {:else if props.event.kind === POLL}
     <NoteContentPoll {...props} />
   {:else}
     <Content {...props} />
diff --git a/src/app/components/NoteContentMinimal.svelte b/src/app/components/NoteContentMinimal.svelte
index 99dec195..1e6f4437 100644
--- a/src/app/components/NoteContentMinimal.svelte
+++ b/src/app/components/NoteContentMinimal.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
-  import {Poll} from "nostr-tools/kinds"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
   import NoteContentMinimalEventTime from "@app/components/NoteContentMinimalEventTime.svelte"
   import NoteContentMinimalThread from "@app/components/NoteContentMinimalThread.svelte"
   import NoteContentMinimalClassified from "@app/components/NoteContentMinimalClassified.svelte"
@@ -21,7 +20,7 @@
     <NoteContentMinimalClassified {...props} />
   {:else if props.event.kind === ZAP_GOAL}
     <NoteContentMinimalGoal {...props} />
-  {:else if props.event.kind === Poll}
+  {:else if props.event.kind === POLL}
     <NoteContentMinimalPoll {...props} />
   {:else}
     <ContentMinimal {...props} />
diff --git a/src/app/components/NoteContentMinimalPoll.svelte b/src/app/components/NoteContentMinimalPoll.svelte
index 0202b65a..25b5a622 100644
--- a/src/app/components/NoteContentMinimalPoll.svelte
+++ b/src/app/components/NoteContentMinimalPoll.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import type {ComponentProps} from "svelte"
   import {derived} from "svelte/store"
-  import {PollResponse} from "nostr-tools/kinds"
+  import {POLL_RESPONSE} from "@welshman/util"
   import ContentMinimal from "@app/components/ContentMinimal.svelte"
   import {deriveEvents} from "@app/core/state"
   import {getPollResults} from "@app/util/polls"
 
   const props: ComponentProps<typeof ContentMinimal> = $props()
 
-  const responses = deriveEvents([{kinds: [PollResponse], "#e": [props.event.id]}])
+  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#e": [props.event.id]}])
 
   const results = derived(responses, $responses => getPollResults(props.event, $responses))
 </script>
diff --git a/src/app/components/NoteContentPoll.svelte b/src/app/components/NoteContentPoll.svelte
index a60ecda4..5c4904f6 100644
--- a/src/app/components/NoteContentPoll.svelte
+++ b/src/app/components/NoteContentPoll.svelte
@@ -2,7 +2,7 @@
   import type {ComponentProps} from "svelte"
   import {onMount} from "svelte"
   import {request} from "@welshman/net"
-  import {PollResponse} from "nostr-tools/kinds"
+  import {POLL_RESPONSE} from "@welshman/util"
   import PollVotes from "@app/components/PollVotes.svelte"
   import Content from "@app/components/Content.svelte"
 
@@ -15,7 +15,7 @@
 
     request({
       relays: [props.url],
-      filters: [{kinds: [PollResponse], "#e": [props.event.id]}],
+      filters: [{kinds: [POLL_RESPONSE], "#e": [props.event.id]}],
     })
   })
 </script>
diff --git a/src/app/components/PollCreate.svelte b/src/app/components/PollCreate.svelte
index 5a60e68e..576a7034 100644
--- a/src/app/components/PollCreate.svelte
+++ b/src/app/components/PollCreate.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import {insertAt, now, randomId, removeAt, removeUndefined} from "@welshman/lib"
-  import {makeEvent} from "@welshman/util"
+  import {makeEvent, POLL} from "@welshman/util"
   import {publishThunk, waitForThunkError} from "@welshman/app"
-  import {Poll} from "nostr-tools/kinds"
   import {isMobile, preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import HamburgerMenu from "@assets/icons/hamburger-menu.svg?dataurl"
@@ -145,7 +144,7 @@
 
       const pollThunk = publishThunk({
         relays: [url],
-        event: makeEvent(Poll, {content: title.trim(), tags}),
+        event: makeEvent(POLL, {content: title.trim(), tags}),
       })
 
       const error = await waitForThunkError(pollThunk)
diff --git a/src/app/components/PollVotes.svelte b/src/app/components/PollVotes.svelte
index 83448174..ea7b3462 100644
--- a/src/app/components/PollVotes.svelte
+++ b/src/app/components/PollVotes.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import {onDestroy} from "svelte"
   import type {TrustedEvent} from "@welshman/util"
+  import {POLL_RESPONSE} from "@welshman/util"
   import {pubkey, publishThunk, abortThunk} from "@welshman/app"
-  import {PollResponse} from "nostr-tools/kinds"
   import {formatTimestampRelative} from "@welshman/lib"
   import {deriveEvents} from "@app/core/state"
   import {pushToast} from "@app/util/toast"
@@ -24,7 +24,7 @@
 
   const {url, event}: Props = $props()
 
-  const responses = deriveEvents([{kinds: [PollResponse], "#e": [event.id]}])
+  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#e": [event.id]}])
 
   const pollType = getPollType(event)
   const options = getPollOptions(event)
diff --git a/src/app/components/ProfileEdit.svelte b/src/app/components/ProfileEdit.svelte
index 67847d04..7acbab14 100644
--- a/src/app/components/ProfileEdit.svelte
+++ b/src/app/components/ProfileEdit.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type {Profile} from "@welshman/util"
-  import {getTag, makeProfile} from "@welshman/util"
+  import {makeProfile} from "@welshman/util"
   import {pubkey, profilesByPubkey, waitForThunkError} from "@welshman/app"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import {errorMessage} from "@lib/util"
@@ -10,26 +10,18 @@
   import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
   import {clearModals} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
-  import {PROTECTED} from "@app/core/state"
   import {updateProfile} from "@app/core/commands"
 
   const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
-  const shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || [])
-  const initialValues = {profile, shouldBroadcast}
+  const initialValues = {profile}
 
   const back = () => history.back()
 
-  const onsubmit = async ({
-    profile,
-    shouldBroadcast,
-  }: {
-    profile: Profile
-    shouldBroadcast: boolean
-  }) => {
+  const onsubmit = async ({profile}: {profile: Profile}) => {
     loading = true
 
     try {
-      const error = await waitForThunkError(updateProfile({profile, shouldBroadcast}))
+      const error = await waitForThunkError(updateProfile({profile}))
 
       if (error) {
         pushToast({
diff --git a/src/app/components/ProfileEditForm.svelte b/src/app/components/ProfileEditForm.svelte
index df706135..7e37ee51 100644
--- a/src/app/components/ProfileEditForm.svelte
+++ b/src/app/components/ProfileEditForm.svelte
@@ -6,7 +6,6 @@
   import MapPoint from "@assets/icons/map-point.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Field from "@lib/components/Field.svelte"
-  import FieldInline from "@lib/components/FieldInline.svelte"
   import Button from "@lib/components/Button.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
@@ -17,7 +16,6 @@
 
   type Values = {
     profile: Profile
-    shouldBroadcast: boolean
   }
 
   type Props = {
@@ -77,7 +75,7 @@
       {/snippet}
       {#snippet input()}
         <textarea
-          class="textarea textarea-bordered leading-4"
+          class="textarea textarea-bordered leading-4 w-full"
           rows="5"
           bind:value={values.profile.about}></textarea>
       {/snippet}
@@ -104,25 +102,6 @@
         {/snippet}
       </Field>
     {/if}
-    {#if !isSignup}
-      <FieldInline>
-        {#snippet label()}
-          <p>Broadcast Profile</p>
-        {/snippet}
-        {#snippet input()}
-          <input
-            type="checkbox"
-            class="toggle toggle-primary"
-            bind:checked={values.shouldBroadcast} />
-        {/snippet}
-        {#snippet info()}
-          <p>
-            If enabled, changes will be published to the broader nostr network in addition to spaces
-            you are a member of.
-          </p>
-        {/snippet}
-      </FieldInline>
-    {/if}
   </ModalBody>
   <ModalFooter>
     {@render footer()}
diff --git a/src/app/components/SignUpProfile.svelte b/src/app/components/SignUpProfile.svelte
index 1f7ec57e..04a3d122 100644
--- a/src/app/components/SignUpProfile.svelte
+++ b/src/app/components/SignUpProfile.svelte
@@ -17,7 +17,7 @@
 
   const profile = getKey<Profile>("signup.profile")!
 
-  const initialValues = {profile, shouldBroadcast: false}
+  const initialValues = {profile}
 
   const back = () => history.back()
 
diff --git a/src/app/components/SpaceMenu.svelte b/src/app/components/SpaceMenu.svelte
index 09a12ba8..c32c4e28 100644
--- a/src/app/components/SpaceMenu.svelte
+++ b/src/app/components/SpaceMenu.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import {derived} from "svelte/store"
-  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
-  import {Poll} from "nostr-tools/kinds"
+  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
   import {deriveRelay, deriveRelayDisplay, createSearch, pubkey} from "@welshman/app"
   import {fly} from "@lib/transition"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
@@ -267,7 +266,7 @@
           <Icon icon={CalendarMinimalistic} /> Calendar
         </SecondaryNavItem>
       {/if}
-      {#if $spaceKinds.has(Poll)}
+      {#if $spaceKinds.has(POLL)}
         <SecondaryNavItem href={pollsPath}>
           <Icon icon={Revote} /> Polls
         </SecondaryNavItem>
diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts
index 97a866d3..357f11db 100644
--- a/src/app/core/commands.ts
+++ b/src/app/core/commands.ts
@@ -18,7 +18,6 @@ import {
 import {Nip01Signer} from "@welshman/signer"
 import type {UploadTask} from "@welshman/editor"
 import type {TrustedEvent, EventContent, Profile, PublishedRoomMeta} from "@welshman/util"
-import {PollResponse} from "nostr-tools/kinds"
 import {
   DELETE,
   REPORT,
@@ -33,6 +32,7 @@ import {
   ROOMS,
   COMMENT,
   APP_DATA,
+  POLL_RESPONSE,
   isSignedEvent,
   makeEvent,
   normalizeRelayUrl,
@@ -53,7 +53,6 @@ import {
   isPublishedProfile,
   editProfile,
   createProfile,
-  uniqTags,
   ManagementMethod,
 } from "@welshman/util"
 import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
@@ -85,6 +84,7 @@ import {
   SETTINGS,
   PROTECTED,
   INDEXER_RELAYS,
+  DEFAULT_RELAYS,
   DEFAULT_BLOSSOM_SERVERS,
   userSpaceUrls,
   userSettingsValues,
@@ -389,7 +389,7 @@ export type PollResponseParams = {
 }
 
 export const makePollResponse = ({event, selectedIds}: PollResponseParams) =>
-  makeEvent(PollResponse, {
+  makeEvent(POLL_RESPONSE, {
     content: "",
     tags: [["e", event.id], ...selectedIds.map(selectedId => ["response", selectedId])],
   })
@@ -724,34 +724,18 @@ export const uploadFile = async (file: File, options: UploadFileOptions = {}) =>
 // Update Profile
 
 export const initProfile = (profile: Profile) => {
-  const template = createProfile(profile)
+  const event = makeEvent(PROFILE, createProfile(profile))
 
-  // Start out protected by default
-  template.tags.push(PROTECTED)
-
-  const event = makeEvent(PROFILE, template)
-
-  // Don't publish anywhere yet, wait until they join a space
-  return publishThunk({event, relays: []})
+  return publishThunk({event, relays: DEFAULT_RELAYS})
 }
 
-export const updateProfile = ({
-  profile,
-  shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || []),
-}: {
-  profile: Profile
-  shouldBroadcast?: boolean
-}) => {
+export const updateProfile = ({profile}: {profile: Profile}) => {
   const router = Router.get()
   const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
-  const scenarios = [router.FromRelays(get(userSpaceUrls))]
+  const scenarios = [router.FromRelays(get(userSpaceUrls)), router.FromUser(), router.Index()]
 
-  if (shouldBroadcast) {
-    scenarios.push(router.FromUser(), router.Index())
-    template.tags = template.tags.filter(nthNe(0, "-"))
-  } else {
-    template.tags = uniqTags([...template.tags, PROTECTED])
-  }
+  // Remove protected tag, we used to add it
+  template.tags = template.tags.filter(nthNe(0, "-"))
 
   const event = makeEvent(template.kind, template)
   const relays = router.merge(scenarios).getUrls()
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index 78e8576c..0630385d 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -3,7 +3,6 @@ import {context as pomadeContext} from "@pomade/core"
 import {Capacitor} from "@capacitor/core"
 import {derived, readable, writable} from "svelte/store"
 import * as nip19 from "nostr-tools/nip19"
-import {Poll} from "nostr-tools/kinds"
 import {
   on,
   gt,
@@ -93,6 +92,7 @@ import {
   THREAD,
   CLASSIFIED,
   WRAP,
+  POLL,
   PROFILE,
   ZAP_GOAL,
   ZAP_REQUEST,
@@ -327,7 +327,7 @@ if (ENABLE_ZAPS) {
   REACTION_KINDS.push(ZAP_RESPONSE)
 }
 
-export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, Poll]
+export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, POLL]
 
 export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]
 
diff --git a/src/app/core/sync.ts b/src/app/core/sync.ts
index a92b3bfc..483d495a 100644
--- a/src/app/core/sync.ts
+++ b/src/app/core/sync.ts
@@ -1,7 +1,6 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
 import {last, call, assoc, chunk, WEEK, ago} from "@welshman/lib"
-import {PollResponse} from "nostr-tools/kinds"
 import {merged} from "@welshman/store"
 import {
   getListTags,
@@ -20,6 +19,7 @@ import {
   RELAY_ADD_MEMBER,
   RELAY_REMOVE_MEMBER,
   MESSAGE,
+  POLL_RESPONSE,
   isSignedEvent,
   unionFilters,
 } from "@welshman/util"
@@ -280,7 +280,7 @@ const syncSpace = (url: string) => {
     filters: [
       {kinds: [...relayKinds, ...roomMetaKinds, ...roomDeleteKinds, ...CONTENT_KINDS, MESSAGE]},
       makeCommentFilter(CONTENT_KINDS, {since}),
-      {kinds: [...REACTION_KINDS, PollResponse], since},
+      {kinds: [...REACTION_KINDS, POLL_RESPONSE], since},
     ],
   })
 
diff --git a/src/app/util/routes.ts b/src/app/util/routes.ts
index 1a5371ae..59756806 100644
--- a/src/app/util/routes.ts
+++ b/src/app/util/routes.ts
@@ -6,7 +6,6 @@ import {page} from "$app/stores"
 import {nthEq} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {getAddress} from "@welshman/util"
-import {Poll} from "nostr-tools/kinds"
 import {tracker, userMessagingRelayList} from "@welshman/app"
 import {identity} from "@welshman/lib"
 import {
@@ -16,6 +15,7 @@ import {
   CLASSIFIED,
   ZAP_GOAL,
   EVENT_TIME,
+  POLL,
   getPubkeyTagValues,
   getRelaysFromList,
 } from "@welshman/util"
@@ -149,7 +149,7 @@ export const getEventPath = (event: TrustedEvent, urls: string[]) => {
       return makeCalendarPath(url, getAddress(event))
     }
 
-    if (event.kind === Poll) {
+    if (event.kind === POLL) {
       return makePollPath(url, event.id)
     }
 
@@ -199,7 +199,7 @@ export const getRoomItemPath = (url: string, event: TrustedEvent) => {
       return makeGoalPath(url, event.id)
     case EVENT_TIME:
       return makeCalendarPath(url, getAddress(event))
-    case Poll:
+    case POLL:
       return makePollPath(url, event.id)
   }
 }
diff --git a/src/routes/spaces/[relay]/polls/+page.svelte b/src/routes/spaces/[relay]/polls/+page.svelte
index c5ac4b2d..c458ec03 100644
--- a/src/routes/spaces/[relay]/polls/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/+page.svelte
@@ -5,7 +5,7 @@
   import {page} from "$app/stores"
   import {sortBy, partition, spec, pushToMapKey, max} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {getTagValue} from "@welshman/util"
+  import {getTagValue, POLL} from "@welshman/util"
   import {fly} from "@lib/transition"
   import PollIcon from "@assets/icons/revote.svg?dataurl"
   import Add from "@assets/icons/add.svg?dataurl"
@@ -16,7 +16,6 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import PollItem from "@app/components/PollItem.svelte"
   import PollCreate from "@app/components/PollCreate.svelte"
-  import {Poll} from "nostr-tools/kinds"
   import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
   import {pushModal} from "@app/util/modal"
@@ -31,7 +30,7 @@
 
   const items = $derived.by(() => {
     const scores = new Map<string, number[]>()
-    const [polls, comments] = partition(spec({kind: Poll}), $events)
+    const [polls, comments] = partition(spec({kind: POLL}), $events)
 
     for (const comment of comments) {
       const id = getTagValue("E", comment.tags)
@@ -48,7 +47,7 @@
     const feed = makeFeed({
       url,
       element: element!,
-      filters: [{kinds: [Poll]}, makeCommentFilter([Poll])],
+      filters: [{kinds: [POLL]}, makeCommentFilter([POLL])],
       onBackwardExhausted: () => {
         loading = false
       },
diff --git a/src/routes/spaces/[relay]/polls/[id]/+page.svelte b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
index 976f9c36..38fc649f 100644
--- a/src/routes/spaces/[relay]/polls/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
@@ -3,7 +3,7 @@
   import {page} from "$app/stores"
   import {sleep} from "@welshman/lib"
   import type {MakeNonOptional} from "@welshman/lib"
-  import {COMMENT} from "@welshman/util"
+  import {COMMENT, POLL, POLL_RESPONSE} from "@welshman/util"
   import {repository} from "@welshman/app"
   import {request} from "@welshman/net"
   import {deriveEventsById, deriveEventsAsc} from "@welshman/store"
@@ -18,7 +18,6 @@
   import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
   import {deriveEvent, decodeRelay} from "@app/core/state"
-  import {Poll, PollResponse} from "nostr-tools/kinds"
 
   const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
@@ -48,7 +47,7 @@
 
     request({
       relays: [url],
-      filters: [{kinds: [Poll], ids: [id]}, {kinds: [PollResponse], "#e": [id]}, ...filters],
+      filters: [{kinds: [POLL], ids: [id]}, {kinds: [POLL_RESPONSE], "#e": [id]}, ...filters],
       signal: controller.signal,
     })
 
diff --git a/src/routes/spaces/[relay]/recent/+page.svelte b/src/routes/spaces/[relay]/recent/+page.svelte
index c0abba62..6afd9435 100644
--- a/src/routes/spaces/[relay]/recent/+page.svelte
+++ b/src/routes/spaces/[relay]/recent/+page.svelte
@@ -25,6 +25,7 @@
     ZAP_GOAL,
     EVENT_TIME,
     COMMENT,
+    POLL,
     getTagValue,
     getTagValues,
     getIdAndAddress,
@@ -50,7 +51,6 @@
   import RecentConversation from "@app/components/RecentConversation.svelte"
   import {decodeRelay, deriveEventsForUrl, CONTENT_KINDS} from "@app/core/state"
   import {goToEvent} from "@app/util/routes"
-  import {Poll} from "nostr-tools/kinds"
 
   const url = decodeRelay($page.params.relay!)
   const since = ago(3, MONTH)
@@ -305,7 +305,7 @@
         <GoalItem {url} {event} />
       {:else if event.kind === EVENT_TIME}
         <CalendarEventItem {url} {event} />
-      {:else if event.kind === Poll}
+      {:else if event.kind === POLL}
         <PollItem {url} {event} />
       {:else}
         <NoteItem {url} {event} />