refactor: align room mention labels with link rendering

src/app/components/ContentLinkBlock.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {call, ellipsize, displayUrl, postJson} from "@welshman/lib"
-  import {isRelayUrl, getTagValue, normalizeRelayUrl} from "@welshman/util"
+  import {isRelayUrl, getTagValue, normalizeRelayUrl, displayRelayUrl} from "@welshman/util"
   import {preventDefault, stopPropagation} from "@lib/html"
   import LinkRound from "@assets/icons/link-round.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -8,7 +8,15 @@
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
   import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
   import {pushModal} from "@app/util/modal"
-  import {dufflepud, PLATFORM_URL, IMAGE_CONTENT_TYPES, VIDEO_CONTENT_TYPES} from "@app/core/state"
+  import {
+    dufflepud,
+    PLATFORM_URL,
+    IMAGE_CONTENT_TYPES,
+    VIDEO_CONTENT_TYPES,
+    displayRoom,
+    isRoomId,
+    splitRoomId,
+  } from "@app/core/state"
   import {makeRoomPath, makeSpacePath} from "@app/util/routes"
 
   const {value, event} = $props()
@@ -16,25 +24,43 @@
   let hideImage = $state(false)
 
   const url = value.url.toString()
-  const splitRoomReference = (input: string) => {
-    const separatorIndex = input.indexOf("'")
-
-    if (separatorIndex === -1) {
+  const roomReference = call(() => {
+    if (!isRoomId(url)) {
       return undefined
     }
 
-    const roomUrl = input.slice(0, separatorIndex)
-    const h = input.slice(separatorIndex + 1)
+    const [roomUrl, h] = splitRoomId(url)
 
-    if (!h || !isRelayUrl(roomUrl)) {
+    if (!roomUrl || !h || !isRelayUrl(roomUrl)) {
       return undefined
     }
 
     return {url: normalizeRelayUrl(roomUrl), h}
-  }
+  })
+
+  const relayReference = call(() => {
+    if (roomReference || !isRelayUrl(url)) {
+      return undefined
+    }
+
+    return normalizeRelayUrl(url)
+  })
+
+  const label = call(() => {
+    if (roomReference) {
+      const spaceName = displayRelayUrl(roomReference.url)
+      const roomName = displayRoom(roomReference.url, roomReference.h)
+
+      return `~${spaceName} / ${roomName}`
+    }
+
+    if (relayReference) {
+      return `~${displayRelayUrl(relayReference)}`
+    }
+
+    return displayUrl(url)
+  })
 
-  const roomReference = splitRoomReference(url)
-  const relayReference = !roomReference && isRelayUrl(url) ? normalizeRelayUrl(url) : undefined
   const fileType = getTagValue("file-type", event.tags) || ""
   const [href, external] = call(() => {
     if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
@@ -74,7 +100,7 @@
     {:else if roomReference || relayReference}
       <div class="bg-alt p-4 leading-normal">
         <Icon icon={LinkRound} size={3} class="inline-block" />
-        <span class="ml-2">{displayUrl(url)}</span>
+        <span class="ml-2">{label}</span>
       </div>
     {:else}
       {#await loadPreview()}

src/app/components/ContentLinkInline.svelte

@@ -1,40 +1,65 @@
 <script lang="ts">
   import {call, displayUrl} from "@welshman/lib"
-  import {isRelayUrl, getTagValue, normalizeRelayUrl} from "@welshman/util"
+  import {isRelayUrl, getTagValue, normalizeRelayUrl, displayRelayUrl} from "@welshman/util"
   import {preventDefault, stopPropagation} from "@lib/html"
   import LinkRound from "@assets/icons/link-round.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Link from "@lib/components/Link.svelte"
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
   import {pushModal} from "@app/util/modal"
-  import {PLATFORM_URL, IMAGE_CONTENT_TYPES} from "@app/core/state"
+  import {
+    PLATFORM_URL,
+    IMAGE_CONTENT_TYPES,
+    displayRoom,
+    isRoomId,
+    splitRoomId,
+  } from "@app/core/state"
   import {makeRoomPath, makeSpacePath} from "@app/util/routes"
 
   const {value, event} = $props()
 
   const url = value.url.toString()
-  const splitRoomReference = (input: string) => {
-    const separatorIndex = input.indexOf("'")
-
-    if (separatorIndex === -1) {
+  const roomReference = call(() => {
+    if (!isRoomId(url)) {
       return undefined
     }
 
-    const roomUrl = input.slice(0, separatorIndex)
-    const h = input.slice(separatorIndex + 1)
+    const [roomUrl, h] = splitRoomId(url)
 
-    if (!h || !isRelayUrl(roomUrl)) {
+    if (!roomUrl || !h || !isRelayUrl(roomUrl)) {
       return undefined
     }
 
     return {url: normalizeRelayUrl(roomUrl), h}
-  }
+  })
+
+  const relayReference = call(() => {
+    if (roomReference || !isRelayUrl(url)) {
+      return undefined
+    }
+
+    return normalizeRelayUrl(url)
+  })
+
+  const label = call(() => {
+    if (roomReference) {
+      const spaceName = displayRelayUrl(roomReference.url)
+      const roomName = displayRoom(roomReference.url, roomReference.h)
+
+      return `~${spaceName} / ${roomName}`
+    }
+
+    if (relayReference) {
+      return `~${displayRelayUrl(relayReference)}`
+    }
+
+    return displayUrl(url)
+  })
 
-  const roomReference = splitRoomReference(url)
   const fileType = getTagValue("file-type", event.tags) || ""
   const [href, external] = call(() => {
     if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
-    if (isRelayUrl(url)) return [makeSpacePath(normalizeRelayUrl(url)), false]
+    if (relayReference) return [makeSpacePath(relayReference), false]
     if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
 
     return [url, true]
@@ -55,6 +80,6 @@
 {:else}
   <Link {external} {href} class="link-content whitespace-nowrap">
     <Icon icon={LinkRound} size={3} class="inline-block" />
-    {displayUrl(url)}
+    {label}
   </Link>
 {/if}

src/app/core/state.ts

@@ -594,6 +594,8 @@ export const getRoomType = (room: RoomMeta): RoomType =>
 
 export const makeRoomId = (url: string, h: string) => `${url}'${h}`
 
+export const isRoomId = (id: string) => id.includes("'")
+
 export const splitRoomId = (id: string) => id.split("'")
 
 export const hasNip29 = (relay?: RelayProfile) =>

src/app/editor/RoomReferenceNodeView.ts

@@ -1,4 +1,5 @@
 import type {NodeViewRendererProps} from "@tiptap/core"
+import {displayRelayUrl} from "@welshman/util"
 import {deriveRoom} from "@app/core/state"
 
 export const RoomReferenceNodeView = ({node}: NodeViewRendererProps) => {
@@ -10,7 +11,7 @@ export const RoomReferenceNodeView = ({node}: NodeViewRendererProps) => {
   dom.classList.add("tiptap-object")
 
   const unsubRoom = room.subscribe($room => {
-    dom.textContent = `~${$room.name || h}`
+    dom.textContent = `~${displayRelayUrl(url)} / ${$room.name || h}`
   })
 
   return {

src/app/editor/RoomSuggestion.svelte

@@ -9,9 +9,10 @@
   const {value}: Props = $props()
   const [url = "", h = ""] = splitRoomId(value)
   const room = deriveRoom(url, h)
+
+  const label = $derived(`~${displayRelayUrl(url)} / ${$room.name || h}`)
 </script>
 
-<div class="flex max-w-full flex-col gap-1">
-  <div class="overflow-hidden text-ellipsis text-base font-semibold">~{$room.name || h}</div>
-  <div class="overflow-hidden text-ellipsis text-sm opacity-75">{displayRelayUrl(url)}'{h}</div>
+<div class="max-w-full overflow-hidden text-ellipsis text-base font-semibold">
+  {label}
 </div>

src/app/editor/index.ts

@@ -27,7 +27,13 @@ import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
 import {RoomReferenceExtension} from "@app/editor/RoomReferenceExtension"
 import RoomSuggestion from "@app/editor/RoomSuggestion.svelte"
 import {uploadFile} from "@app/core/commands"
-import {deriveSpaceMembers, splitRoomId, userSpaceUrls, roomsByUrl} from "@app/core/state"
+import {
+  deriveSpaceMembers,
+  splitRoomId,
+  userSpaceUrls,
+  roomsByUrl,
+  type Room,
+} from "@app/core/state"
 import {pushToast} from "@app/util/toast"
 
 export const makeEditor = async ({
@@ -93,16 +99,11 @@ export const makeEditor = async ({
   const roomReferenceSearch = derived(
     [throttled(800, userSpaceUrls), throttled(800, roomsByUrl)],
     ([$userSpaceUrls, $roomsByUrl]) => {
-      const options: Array<{id: string; name: string; h: string; url: string}> = []
+      const options: Room[] = []
 
       for (const roomUrl of $userSpaceUrls) {
         for (const room of $roomsByUrl.get(roomUrl) || []) {
-          options.push({
-            id: room.id,
-            name: room.name || "",
-            h: room.h,
-            url: roomUrl,
-          })
+          options.push(room)
         }
       }