{#if others.length === 0}
-
+
Note to self
{:else if others.length === 1}
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index 8d1e40e1..b96ba943 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -2,13 +2,7 @@
import {type Instance} from "tippy.js"
import {hash} from "@welshman/lib"
import type {TrustedEvent} from "@welshman/util"
- import {
- thunks,
- deriveProfile,
- deriveProfileDisplay,
- formatTimestampAsTime,
- pubkey,
- } from "@welshman/app"
+ import {thunks, formatTimestampAsTime, pubkey} from "@welshman/app"
import {isMobile} from "@lib/html"
import Icon from "@lib/components/Icon.svelte"
import Button from "@lib/components/Button.svelte"
@@ -21,7 +15,7 @@
import ProfileDetail from "@app/components/ProfileDetail.svelte"
import ChatMessageMenu from "@app/components/ChatMessageMenu.svelte"
import ChatMessageMenuMobile from "@app/components/ChatMessageMenuMobile.svelte"
- import {colors} from "@app/state"
+ import {colors, deriveAlias, deriveAliasDisplay} from "@app/state"
import {makeDelete, makeReaction, sendWrapped} from "@app/commands"
import {pushModal} from "@app/modal"
@@ -36,8 +30,8 @@
const thunk = $thunks[event.id]
const isOwn = event.pubkey === $pubkey
- const profile = deriveProfile(event.pubkey)
- const profileDisplay = deriveProfileDisplay(event.pubkey)
+ const alias = deriveAlias(event.pubkey)
+ const aliasDisplay = deriveAliasDisplay(event.pubkey)
const [_, colorValue] = colors[parseInt(hash(event.pubkey)) % colors.length]
const reply = () => replyTo(event)
@@ -107,12 +101,12 @@
{#if !isOwn}
diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index dd4ee14b..572ce445 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -38,8 +38,8 @@
showEntire?: boolean
hideMediaAtDepth?: number
expandMode?: string
- relays?: string[]
depth?: number
+ url?: string
}
let {
@@ -49,8 +49,8 @@
showEntire = $bindable(false),
hideMediaAtDepth = 1,
expandMode = "block",
- relays = [],
depth = 0,
+ url,
}: Props = $props()
const fullContent = parse(event)
@@ -146,10 +146,10 @@
{/if}
{:else if isProfile(parsed)}
-
+
{:else if isEvent(parsed) || isAddress(parsed)}
{#if isBlock(i)}
-
+
{:else}
+ import type {ProfilePointer} from "@welshman/content"
import {displayProfile} from "@welshman/util"
import {deriveProfile} from "@welshman/app"
import Button from "@lib/components/Button.svelte"
import ProfileDetail from "@app/components/ProfileDetail.svelte"
import {pushModal} from "@app/modal"
+ import {deriveAlias} from "@app/state"
- const {value} = $props()
+ type Props = {
+ value: ProfilePointer
+ url?: string
+ }
- const profile = deriveProfile(value.pubkey)
+ const {value, url}: Props = $props()
- const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey})
+ const alias = deriveAlias(value.pubkey, url)
+
+ const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey, url})
diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index 2f491671..19f77715 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -3,6 +3,7 @@
import {goto} from "$app/navigation"
import {nthEq} from "@welshman/lib"
import {Router, tracker, repository} from "@welshman/app"
+ import type {TrustedEvent} from "@welshman/util"
import {Address, DIRECT_MESSAGE, MESSAGE, THREAD, EVENT_TIME} from "@welshman/util"
import {scrollToEvent} from "@lib/html"
import Button from "@lib/components/Button.svelte"
@@ -12,11 +13,24 @@
import {deriveEvent, entityLink, ROOM} from "@app/state"
import {makeThreadPath, makeCalendarPath, makeRoomPath} from "@app/routes"
- const {value, event, depth, hideMediaAtDepth, relays = []} = $props()
+ type Props = {
+ value: any
+ hideMediaAtDepth: number
+ event: TrustedEvent
+ depth: number
+ url?: string
+ }
- const {id, identifier, kind, pubkey, relays: relayHints = []} = value
+ const {value, event, depth, hideMediaAtDepth, url}: Props = $props()
+
+ const {id, identifier, kind, pubkey, relays = []} = value
const idOrAddress = id || new Address(kind, pubkey, identifier).toString()
- const mergedRelays = [...relays, ...Router.get().Quote(event, idOrAddress, relayHints).getUrls()]
+ const mergedRelays = Router.get().Quote(event, idOrAddress, relays).getUrls()
+
+ if (url) {
+ mergedRelays.push(url)
+ }
+
const quote = deriveEvent(idOrAddress, mergedRelays)
const entity = id
? nip19.neventEncode({id, relays: mergedRelays})
@@ -80,8 +94,8 @@