diff --git a/src/app/components/ChannelMessage.svelte b/src/app/components/ChannelMessage.svelte index d23dec85..d100c3eb 100644 --- a/src/app/components/ChannelMessage.svelte +++ b/src/app/components/ChannelMessage.svelte @@ -7,6 +7,8 @@ formatTimestampAsDate, formatTimestampAsTime, thunkIsComplete, + deriveProfile, + deriveProfileDisplay, } from "@welshman/app" import {isMobile} from "@lib/html" import TapTarget from "@lib/components/TapTarget.svelte" @@ -20,7 +22,7 @@ import ChannelMessageEmojiButton from "@app/components/ChannelMessageEmojiButton.svelte" import ChannelMessageMenuButton from "@app/components/ChannelMessageMenuButton.svelte" import ChannelMessageMenuMobile from "@app/components/ChannelMessageMenuMobile.svelte" - import {colors, deriveAliasedProfile, deriveAliasDisplay} from "@app/state" + import {colors} from "@app/state" import {publishDelete, publishReaction} from "@app/commands" import {pushModal} from "@app/modal" @@ -37,8 +39,8 @@ const thunk = $thunks[event.id] const today = formatTimestampAsDate(now()) - const profile = deriveAliasedProfile(event.pubkey, url) - const aliasDisplay = deriveAliasDisplay(event.pubkey, url) + const profile = deriveProfile(event.pubkey, [url]) + const profileDisplay = deriveProfileDisplay(event.pubkey, [url]) const [_, colorValue] = colors[parseInt(hash(event.pubkey)) % colors.length] const hideMenuButton = $derived($thunk && !thunkIsComplete($thunk)) @@ -75,7 +77,7 @@ {#if showPubkey}
{#if formatTimestampAsDate(event.created_at) === today} diff --git a/src/app/components/ContentMention.svelte b/src/app/components/ContentMention.svelte index d29ff280..3544e6db 100644 --- a/src/app/components/ContentMention.svelte +++ b/src/app/components/ContentMention.svelte @@ -1,10 +1,11 @@ diff --git a/src/app/components/Profile.svelte b/src/app/components/Profile.svelte index 5bc4c482..b19afa0f 100644 --- a/src/app/components/Profile.svelte +++ b/src/app/components/Profile.svelte @@ -1,4 +1,5 @@ diff --git a/src/app/components/ProfileDetail.svelte b/src/app/components/ProfileDetail.svelte index bcdf964a..1af9aa76 100644 --- a/src/app/components/ProfileDetail.svelte +++ b/src/app/components/ProfileDetail.svelte @@ -1,5 +1,6 @@ {#if $profile} diff --git a/src/app/components/ProfileName.svelte b/src/app/components/ProfileName.svelte index cee0f7a7..41c224d0 100644 --- a/src/app/components/ProfileName.svelte +++ b/src/app/components/ProfileName.svelte @@ -1,5 +1,6 @@ -{$aliasDisplay} +{$profileDisplay} diff --git a/src/app/editor/MentionNodeView.ts b/src/app/editor/MentionNodeView.ts index 20b82f86..869fb7ea 100644 --- a/src/app/editor/MentionNodeView.ts +++ b/src/app/editor/MentionNodeView.ts @@ -1,11 +1,12 @@ import type {NodeViewProps} from "@tiptap/core" -import {deriveAliasDisplay} from "@app/state" +import {removeNil} from "@welshman/lib" +import {deriveProfileDisplay} from "@welshman/app" export const makeMentionNodeView = (url?: string) => ({node}: NodeViewProps) => { const dom = document.createElement("span") - const display = deriveAliasDisplay(node.attrs.pubkey, url) + const display = deriveProfileDisplay(node.attrs.pubkey, removeNil([url])) dom.classList.add("tiptap-object") diff --git a/src/app/editor/ProfileSuggestion.svelte b/src/app/editor/ProfileSuggestion.svelte index 518fba5b..dc29eb82 100644 --- a/src/app/editor/ProfileSuggestion.svelte +++ b/src/app/editor/ProfileSuggestion.svelte @@ -1,14 +1,15 @@