diff --git a/src/app/components/ChatComposeParent.svelte b/src/app/components/ChatComposeParent.svelte index a9f9ecff..b2c63bb4 100644 --- a/src/app/components/ChatComposeParent.svelte +++ b/src/app/components/ChatComposeParent.svelte @@ -1,4 +1,5 @@
+ import {removeUndefined} from "@welshman/lib" import type {ProfilePointer} from "@welshman/content" import Button from "@lib/components/Button.svelte" import ProfileDetail from "@app/components/ProfileDetail.svelte" @@ -12,7 +13,7 @@ const {value, url}: Props = $props() - const display = $profiles.display(value.pubkey).$ + const display = $profiles.display(value.pubkey, removeUndefined([url])).$ const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey, url}) diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte index 4539dfe0..bb8df47e 100644 --- a/src/app/components/EventReply.svelte +++ b/src/app/components/EventReply.svelte @@ -109,7 +109,7 @@ class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2">
{#if parent} - onClearParent?.()} verb="Replying to" /> + onClearParent?.()} verb="Replying to" /> {/if}
diff --git a/src/app/components/Profile.svelte b/src/app/components/Profile.svelte index d266f788..d725bcf0 100644 --- a/src/app/components/Profile.svelte +++ b/src/app/components/Profile.svelte @@ -1,5 +1,6 @@
0} {@const pubkeys = $innerComments.map(e => e.pubkey)} {@const isOwn = pubkeys.includes($user.pubkey)} - {@const info = displayList(pubkeys.map(pk => $profiles.display(pk).get()))} + {@const info = displayList(pubkeys.map(pk => $profiles.display(pk, [url]).get()))} {@const tooltip = `${info} commented`}
{ setKey("RoomMembersAdd.confirm", true) diff --git a/src/app/components/SpaceMember.svelte b/src/app/components/SpaceMember.svelte index f478c934..5a0bd97f 100644 --- a/src/app/components/SpaceMember.svelte +++ b/src/app/components/SpaceMember.svelte @@ -18,7 +18,7 @@ const {url, pubkey, roles = []}: Props = $props() - const profileDisplay = $profiles.display(pubkey).$ + const profileDisplay = $profiles.display(pubkey, [url]).$ const supportedMethods = deriveSpaceSupportedMethods(url) const canUnallow = $derived($supportedMethods.includes("unallowpubkey")) const canBan = $derived($supportedMethods.includes("banpubkey")) diff --git a/src/app/components/SpaceMemberMenu.svelte b/src/app/components/SpaceMemberMenu.svelte index 07623cc4..9f5759bb 100644 --- a/src/app/components/SpaceMemberMenu.svelte +++ b/src/app/components/SpaceMemberMenu.svelte @@ -34,7 +34,7 @@ const removeMember = () => pushModal(Confirm, { title: "Remove Member", - message: `Remove @${$profiles.display(pubkey).get()} from the space?`, + message: `Remove @${$profiles.display(pubkey, [url]).get()} from the space?`, confirm: async () => { const {error} = await $relayManagement.forUrl(url).unallowPubkey(pubkey) @@ -50,7 +50,7 @@ const banMember = () => pushModal(Confirm, { title: "Ban Member", - message: `Ban @${$profiles.display(pubkey).get()} from the space?`, + message: `Ban @${$profiles.display(pubkey, [url]).get()} from the space?`, confirm: async () => { const {error} = await $relayManagement.forUrl(url).banPubkey(pubkey) diff --git a/src/app/components/SpaceMemberRoles.svelte b/src/app/components/SpaceMemberRoles.svelte index 9ca288c1..f51a57bd 100644 --- a/src/app/components/SpaceMemberRoles.svelte +++ b/src/app/components/SpaceMemberRoles.svelte @@ -27,7 +27,7 @@ const relayRoles = $app.use(RelayRoles).forUrl(url).$ const roles = $derived(sortBy(role => [role.order(), role.label() ?? ""], $relayRoles)) - const profileDisplay = $profiles.display(pubkey).$ + const profileDisplay = $profiles.display(pubkey, [url]).$ const memberRoles = deriveSpaceMemberRoles(url) const initial = new Set(get(memberRoles).get(pubkey) ?? []) diff --git a/src/app/components/VideoCallContent.svelte b/src/app/components/VideoCallContent.svelte index f48fd691..349f1767 100644 --- a/src/app/components/VideoCallContent.svelte +++ b/src/app/components/VideoCallContent.svelte @@ -172,13 +172,13 @@ $effect(() => { for (const t of videoTiles) { const pk = pubkeyFromLiveKitIdentity(t.liveKitIdentity) - if (pk) $profiles.load(pk) + if (pk) $profiles.load(pk, [url]) } }) const labelFor = (liveKitIdentity: string, source: VideoTileData["source"]) => { const pk = pubkeyFromLiveKitIdentity(liveKitIdentity) - const name = pk ? $profiles.display(pk).get() : "Unknown" + const name = pk ? $profiles.display(pk, [url]).get() : "Unknown" return source === Track.Source.ScreenShare ? `${name} ยท screen` : name } diff --git a/src/app/components/VoiceRoomItem.svelte b/src/app/components/VoiceRoomItem.svelte index a0c6b401..a9166441 100644 --- a/src/app/components/VoiceRoomItem.svelte +++ b/src/app/components/VoiceRoomItem.svelte @@ -68,7 +68,7 @@ $effect(() => { for (const p of $participants) { - if (p.pubkey) $profiles.load(p.pubkey) + if (p.pubkey) $profiles.load(p.pubkey, [url]) } }) @@ -102,7 +102,7 @@
- {p.pubkey ? $profiles.display(p.pubkey).get() : "Unknown"} + {p.pubkey ? $profiles.display(p.pubkey, [url]).get() : "Unknown"} + import {removeUndefined} from "@welshman/lib" import {displayHandle} from "@welshman/util" import {displayPubkey} from "@welshman/domain" import {handles, profiles} from "@app/core" @@ -13,7 +14,7 @@ const {value, url}: Props = $props() const pubkey = value - const profileDisplay = $profiles.display(pubkey).$ + const profileDisplay = $profiles.display(pubkey, removeUndefined([url])).$ const handle = $handles.forPubkey(pubkey).$ diff --git a/src/routes/spaces/[relay]/directory/+page.svelte b/src/routes/spaces/[relay]/directory/+page.svelte index c5ef33d7..40a8b35f 100644 --- a/src/routes/spaces/[relay]/directory/+page.svelte +++ b/src/routes/spaces/[relay]/directory/+page.svelte @@ -64,7 +64,8 @@ let term = $state("") const matchesTerm = (pubkey: string, t: string) => - $profiles.display(pubkey).get().toLowerCase().includes(t) || pubkey.toLowerCase().includes(t) + $profiles.display(pubkey, [url]).get().toLowerCase().includes(t) || + pubkey.toLowerCase().includes(t) // In-place search: match by member info or by the name of any role they hold. const visibleMembers = $derived.by(() => {