From 7dffabd9d9fccbe123c9177d9ff6613d4b02e0a7 Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Mon, 14 Sep 2026 16:34:45 -0700
Subject: [PATCH] Bump welshman, use new message kind

---
 package.json                       |  20 +++++++--------
 pnpm-lock.yaml                     | Bin 399969 -> 399969 bytes
 src/app/components/RoomChat.svelte |  39 +++++++++++++++--------------
 src/app/components/RoomItem.svelte |  20 +++++----------
 src/app/rooms.ts                   |  24 ++++++++++--------
 5 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 766b0581..1766b6ec 100644
--- a/package.json
+++ b/package.json
@@ -88,16 +88,16 @@
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^1.0.2",
     "@vite-pwa/sveltekit": "^1.1.0",
-    "@welshman/app": "^0.10.7",
-    "@welshman/content": "^0.10.7",
-    "@welshman/domain": "^0.10.7",
-    "@welshman/editor": "^0.10.7",
-    "@welshman/feeds": "^0.10.7",
-    "@welshman/lib": "^0.10.7",
-    "@welshman/net": "^0.10.7",
-    "@welshman/signer": "^0.10.7",
-    "@welshman/store": "^0.10.7",
-    "@welshman/util": "^0.10.7",
+    "@welshman/app": "^0.10.8",
+    "@welshman/content": "^0.10.8",
+    "@welshman/domain": "^0.10.8",
+    "@welshman/editor": "^0.10.8",
+    "@welshman/feeds": "^0.10.8",
+    "@welshman/lib": "^0.10.8",
+    "@welshman/net": "^0.10.8",
+    "@welshman/signer": "^0.10.8",
+    "@welshman/store": "^0.10.8",
+    "@welshman/util": "^0.10.8",
     "cheerio": "^1.2.0",
     "compressorjs-next": "^1.1.2",
     "dompurify": "^3.4.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b2b4c21fd40b93596f9f9f8431ca3d165cfff0d0..546bddd4b6bed15269ba4e8dce8dc0b4eb6e7f4e 100644
GIT binary patch
delta 3651
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

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

diff --git a/src/app/components/RoomChat.svelte b/src/app/components/RoomChat.svelte
index b351af23..45bff0d1 100644
--- a/src/app/components/RoomChat.svelte
+++ b/src/app/components/RoomChat.svelte
@@ -9,7 +9,8 @@
   import {now, ifLet, ago, MINUTE} from "@welshman/lib"
   import type {Maybe} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {makeEvent, MESSAGE, RELAY_ADD_MEMBER, ROOM_ADD_MEMBER} from "@welshman/util"
+  import {relay, stamp, MESSAGE, RELAY_ADD_MEMBER, ROOM_ADD_MEMBER} from "@welshman/util"
+  import {Message} from "@welshman/domain"
   import {MembershipStatus} from "@welshman/app"
   import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
   import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
@@ -32,11 +33,10 @@
   import ThunkToast from "@app/components/ThunkToast.svelte"
   import VideoCallContent from "@app/components/VideoCallContent.svelte"
   import CallControlBar from "@app/components/CallControlBar.svelte"
-  import {deletes, relays, rooms, thunks, user} from "@app/core"
+  import {deletes, relays, rooms, thunks, user, writer} from "@app/core"
   import {joinRoom, leaveRoom} from "@app/access"
   import {CallState, callTargetRoom, callState, VideoCallLayout, videoCallLayout} from "@app/call"
   import {
-    PROTECTED,
     RoomType,
     deriveUserRoomMembershipStatus,
     getRoomType,
@@ -177,27 +177,15 @@
     }
 
     try {
-      if (h) {
-        tags.push(["h", h])
-      }
-
       const protect = await shouldProtect
 
-      if (protect) {
-        tags.push(PROTECTED)
-      }
-
-      let template: EventContent & {created_at?: number} = {content, tags}
-
       if (eventToEdit) {
         // Don't do anything if message hasn't changed
         if (eventToEdit.content === content) {
           return
         }
 
-        // Delete previous message, to be republished with same timestamp
-        template.created_at = eventToEdit.created_at
-
+        // Delete the previous message, to be republished below with the same timestamp
         const command = await $deletes.deleteEvent($state.snapshot(eventToEdit), w =>
           w.setProtected(protect),
         )
@@ -205,17 +193,30 @@
         command.publishToRelays([url])
       }
 
+      // A share is a quote rather than a reply, so it goes in the content directly and
+      // setParent prepends the reply's own reference ahead of it.
       if (sharedEvent) {
-        template = await prependParent(sharedEvent, template, url)
+        ;({content, tags} = await prependParent(sharedEvent, {content, tags}, url))
+      }
+
+      const eventWriter = writer(Message)
+        .setContent(content)
+        .addTags(...tags)
+        .setProtected(protect)
+
+      if (h) {
+        eventWriter.setRoom(url, h)
+      } else {
+        eventWriter.forceRoutes(relay(url))
       }
 
       if (parent) {
-        template = await prependParent(parent, template, url)
+        eventWriter.setParent(parent)
       }
 
       const thunk = $thunks.publish({
         relays: [url],
-        event: makeEvent(MESSAGE, template),
+        event: stamp(await eventWriter.renderTemplate(), eventToEdit?.created_at),
         delay: $userSettingsValues.send_delay,
       })
 
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index f2e0c079..cdc62dfc 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -1,24 +1,17 @@
 <script lang="ts">
   import cx from "classnames"
   import {readable} from "svelte/store"
-  import {
-    gte,
-    now,
-    uniq,
-    displayList,
-    formatTimestampAsTime,
-    formatTimestampAsDate,
-  } from "@welshman/lib"
+  import {now, uniq, displayList, formatTimestampAsTime, formatTimestampAsDate} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {
     MESSAGE,
     THREAD,
     getCommentFiltersForParent,
     getIdOrAddress,
-    matchTag,
     tagSpec,
     tagValue,
   } from "@welshman/util"
+  import {getContentQuote} from "@welshman/domain"
   import {isMobile} from "@lib/html"
   import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
   import Pen from "@assets/icons/pen.svg?dataurl"
@@ -74,11 +67,10 @@
   const thunk = $derived($thunks.merge($thunksByEventId.get(event.id) ?? noThunks))
   const colorValue = colorFor(event.pubkey)
 
-  const qTag = matchTag(tagSpec("q"), event.tags)
-  const isQuoteOnly = Boolean(
-    gte(qTag?.length, 2) && event.content.trim().match(/^nostr:n(event|addr)1\w+\s*$/),
-  )
-  const innerEvent = isQuoteOnly ? deriveEvent(qTag![1], [url]) : readable(undefined)
+  // A message that is nothing but a reference renders as the event it quotes.
+  const isQuoteOnly = event.content.trim().split(/\s/).length === 1
+  const quote = isQuoteOnly ? getContentQuote(event.content) : undefined
+  const innerEvent = quote ? deriveEvent(quote.value, [url]) : readable(undefined)
   const innerComments = $derived(
     $innerEvent ? deriveEventsForUrl(url, getCommentFiltersForParent([$innerEvent])) : readable([]),
   )
diff --git a/src/app/rooms.ts b/src/app/rooms.ts
index e1ec8197..47929fe6 100644
--- a/src/app/rooms.ts
+++ b/src/app/rooms.ts
@@ -2,8 +2,9 @@ import * as nip19 from "nostr-tools/nip19"
 import {derived, get} from "svelte/store"
 import {formatTimestampAsDate, int, sortBy, uniq, MINUTE} from "@welshman/lib"
 import type {Maybe} from "@welshman/lib"
-import {MESSAGE, makeEvent, outbox, seen, toNostrURI} from "@welshman/util"
+import {outbox, relay, seen, toNostrURI} from "@welshman/util"
 import type {EventContent, TrustedEvent} from "@welshman/util"
+import {Message} from "@welshman/domain"
 import {MembershipStatus, RoomLists, makeRoomKey, createSearch, publish} from "@welshman/app"
 import type {Room, RoomMeta} from "@welshman/app"
 import {
@@ -16,6 +17,7 @@ import {
   thunks,
   relays,
   user,
+  writer,
 } from "@app/core"
 import {deriveUserIsSpaceAdmin} from "@app/management"
 import {makeRoomPath} from "@app/routes"
@@ -83,7 +85,7 @@ export const prependParent = async (
     const resolver = router.get().resolver
     const relays = url ? [url] : await resolver.relays([seen(parent)])
     const hint = url ?? (await resolver.relay([outbox(parent.pubkey)])) ?? ""
-    const nevent = nip19.neventEncode({...parent, relays})
+    const nevent = nip19.neventEncode({id: parent.id, author: parent.pubkey, relays})
 
     content = toNostrURI(nevent) + "\n\n" + content
     tags = [...tags, ["q", parent.id, hint, parent.pubkey], ["p", parent.pubkey, hint]]
@@ -105,19 +107,19 @@ export const publishRoomQuote = async ({
   protect: boolean
   delay?: number
 }) => {
-  const tags: string[][] = []
+  const eventWriter = writer(Message).setParent(parent).setProtected(protect)
 
   if (h) {
-    tags.push([ROOM, h])
+    eventWriter.setRoom(url, h)
+  } else {
+    eventWriter.forceRoutes(relay(url))
   }
 
-  if (protect) {
-    tags.push(PROTECTED)
-  }
-
-  const event = makeEvent(MESSAGE, await prependParent(parent, {content: "", tags}, url))
-
-  return thunks.get().publish({relays: [url], event, delay})
+  return thunks.get().publish({
+    relays: [url],
+    event: await eventWriter.renderTemplate(),
+    delay,
+  })
 }
 
 // User