mirror of
https://github.com/elk-zone/elk.git
synced 2024-09-06 20:29:08 +01:00
fix: escape/textify the contents of inline and block code (#954)
This commit is contained in:
parent
24d43699bb
commit
f9509f8987
3 changed files with 35 additions and 1 deletions
|
@ -53,10 +53,13 @@ export function parseMastodonHTML(
|
||||||
// Handle code blocks
|
// Handle code blocks
|
||||||
html = html
|
html = html
|
||||||
.replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang: string, raw: string) => {
|
.replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang: string, raw: string) => {
|
||||||
const code = htmlToText(raw)
|
const code = htmlToText(raw).replace(/</g, '<').replace(/>/g, '>')
|
||||||
const classes = lang ? ` class="language-${lang}"` : ''
|
const classes = lang ? ` class="language-${lang}"` : ''
|
||||||
return `><pre><code${classes}>${code}</code></pre>`
|
return `><pre><code${classes}>${code}</code></pre>`
|
||||||
})
|
})
|
||||||
|
.replace(/`([^`\n]*)`/g, (_1, raw) => {
|
||||||
|
return raw ? `<code>${htmlToText(raw).replace(/</g, '<').replace(/>/g, '>')}</code>` : ''
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always sanitize the raw HTML data *after* it has been modified
|
// Always sanitize the raw HTML data *after* it has been modified
|
||||||
|
|
|
@ -40,6 +40,27 @@ exports[`content-rich > custom emoji 1`] = `
|
||||||
|
|
||||||
exports[`content-rich > empty 1`] = `""`;
|
exports[`content-rich > empty 1`] = `""`;
|
||||||
|
|
||||||
|
exports[`content-rich > handles html within code blocks 1`] = `
|
||||||
|
"<p>
|
||||||
|
HTML block code:<br />
|
||||||
|
<pre lang=\\"html\\">
|
||||||
|
<span class="icon--noto icon--noto--1st-place-medal"></span>
|
||||||
|
<span class="icon--noto icon--noto--2nd-place-medal-medal"></span></pre
|
||||||
|
>
|
||||||
|
</p>
|
||||||
|
"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`content-rich > inline code with link 1`] = `
|
||||||
|
"<p>
|
||||||
|
Inline code with link:
|
||||||
|
<code
|
||||||
|
>https://api.iconify.design/noto.css?icons=1st-place-medal,2nd-place-medal</code
|
||||||
|
>
|
||||||
|
</p>
|
||||||
|
"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`content-rich > link + mention 1`] = `
|
exports[`content-rich > link + mention 1`] = `
|
||||||
"<p>
|
"<p>
|
||||||
Happy
|
Happy
|
||||||
|
|
|
@ -20,6 +20,16 @@ describe('content-rich', () => {
|
||||||
expect(formatted).toMatchSnapshot()
|
expect(formatted).toMatchSnapshot()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('inline code with link', async () => {
|
||||||
|
const { formatted } = await render('<p>Inline code with link: `<a href="https://api.iconify.design/noto.css?icons=1st-place-medal,2nd-place-medal" target="_blank" rel="nofollow noopener noreferrer" class="status-link unhandled-link" title="https://api.iconify.design/noto.css?icons=1st-place-medal,2nd-place-medal"><span class="invisible">https://</span><span class="ellipsis">api.iconify.design/noto.css?ic</span><span class="invisible">ons=1st-place-medal,2nd-place-medal</span></a>`</p>')
|
||||||
|
expect(formatted).toMatchSnapshot()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('handles html within code blocks', async () => {
|
||||||
|
const { formatted } = await render('<p>HTML block code:<br>```html<br><span class="icon--noto icon--noto--1st-place-medal"></span><br><span class="icon--noto icon--noto--2nd-place-medal-medal"></span><br>```</p>')
|
||||||
|
expect(formatted).toMatchSnapshot()
|
||||||
|
})
|
||||||
|
|
||||||
it('custom emoji', async () => {
|
it('custom emoji', async () => {
|
||||||
const { formatted } = await render('Daniel Roe :nuxt:', {
|
const { formatted } = await render('Daniel Roe :nuxt:', {
|
||||||
nuxt: {
|
nuxt: {
|
||||||
|
|
Loading…
Reference in a new issue