fix: revert removal of parsing rich content in display name
This reverts commit 5be48b102f
.
zio/stable
parent
5be48b102f
commit
b545efeacc
|
@ -81,7 +81,6 @@ watchEffect(() => {
|
||||||
font-bold sm:text-2xl text-xl
|
font-bold sm:text-2xl text-xl
|
||||||
:content="getDisplayName(account, { rich: true })"
|
:content="getDisplayName(account, { rich: true })"
|
||||||
:emojis="account.emojis"
|
:emojis="account.emojis"
|
||||||
:markdown="false"
|
|
||||||
/>
|
/>
|
||||||
<AccountBotIndicator v-if="account.bot" />
|
<AccountBotIndicator v-if="account.bot" />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -5,17 +5,13 @@ defineOptions({
|
||||||
name: 'ContentRich',
|
name: 'ContentRich',
|
||||||
})
|
})
|
||||||
|
|
||||||
const { content, emojis, markdown = true } = defineProps<{
|
const props = defineProps<{
|
||||||
content: string
|
content: string
|
||||||
markdown?: boolean
|
|
||||||
emojis?: Emoji[]
|
emojis?: Emoji[]
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
export default () => h(
|
export default () => h(
|
||||||
'span',
|
'span',
|
||||||
{ class: 'content-rich' },
|
{ class: 'content-rich' },
|
||||||
contentToVNode(content, {
|
contentToVNode(props.content, emojisArrayToObject(props.emojis || [])),
|
||||||
emojis: emojisArrayToObject(emojis || []),
|
|
||||||
markdown,
|
|
||||||
}),
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -12,7 +12,7 @@ function decode(text: string) {
|
||||||
* Parse raw HTML form Mastodon server to AST,
|
* Parse raw HTML form Mastodon server to AST,
|
||||||
* with interop of custom emojis and inline Markdown syntax
|
* with interop of custom emojis and inline Markdown syntax
|
||||||
*/
|
*/
|
||||||
export function parseMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}, markdown = true) {
|
export function parseMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}) {
|
||||||
let processed = html
|
let processed = html
|
||||||
// custom emojis
|
// custom emojis
|
||||||
.replace(/:([\w-]+?):/g, (_, name) => {
|
.replace(/:([\w-]+?):/g, (_, name) => {
|
||||||
|
@ -21,10 +21,7 @@ export function parseMastodonHTML(html: string, customEmojis: Record<string, Emo
|
||||||
return `<img src="${emoji.url}" alt=":${name}:" class="custom-emoji" data-emoji-id="${name}" />`
|
return `<img src="${emoji.url}" alt=":${name}:" class="custom-emoji" data-emoji-id="${name}" />`
|
||||||
return `:${name}:`
|
return `:${name}:`
|
||||||
})
|
})
|
||||||
|
|
||||||
if (markdown) {
|
|
||||||
// handle code blocks
|
// handle code blocks
|
||||||
processed = processed
|
|
||||||
.replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang, raw) => {
|
.replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang, raw) => {
|
||||||
const code = htmlToText(raw)
|
const code = htmlToText(raw)
|
||||||
const classes = lang ? ` class="language-${lang}"` : ''
|
const classes = lang ? ` class="language-${lang}"` : ''
|
||||||
|
@ -56,14 +53,13 @@ export function parseMastodonHTML(html: string, customEmojis: Record<string, Emo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
return parse(processed)
|
return parse(processed)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function convertMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}) {
|
export async function convertMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}) {
|
||||||
const tree = parseMastodonHTML(html, customEmojis)
|
const tree = parseMastodonHTML(html, customEmojis)
|
||||||
return render(tree)
|
return await render(tree)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function htmlToText(html: string) {
|
export function htmlToText(html: string) {
|
||||||
|
|
|
@ -13,12 +13,9 @@ import AccountHoverWrapper from '~/components/account/AccountHoverWrapper.vue'
|
||||||
*/
|
*/
|
||||||
export function contentToVNode(
|
export function contentToVNode(
|
||||||
content: string,
|
content: string,
|
||||||
{ emojis = {}, markdown = true }: {
|
customEmojis: Record<string, Emoji> = {},
|
||||||
emojis?: Record<string, Emoji>
|
|
||||||
markdown?: boolean
|
|
||||||
} = {},
|
|
||||||
): VNode {
|
): VNode {
|
||||||
const tree = parseMastodonHTML(content, emojis, markdown)
|
const tree = parseMastodonHTML(content, customEmojis)
|
||||||
return h(Fragment, (tree.children as Node[]).map(n => treeToVNode(n)))
|
return h(Fragment, (tree.children as Node[]).map(n => treeToVNode(n)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue