skorotkiewicz/yosup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

web: fix sanitization that I broke

Browse source
This commit is contained in:
Thomas Mathews 2022-12-20 11:06:21 -08:00
parent 29f3997313
commit 6e3e72a65f
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
web/js/ui/fmt.js
View file

@ -10,14 +10,13 @@ function linkify(text="", show_media=false) {
let markup; let markup;
if (show_media && is_img_url(parsed.pathname)) { if (show_media && is_img_url(parsed.pathname)) {
markup = html` markup = html`
<img class="inline-img clickable" src="${url}" onclick="open_media_preview('${url}', 'image')"/> <img class="inline-img clickable" src="${url}"
`; onclick="open_media_preview('${url}', 'image')"/>`;
} else if (show_media && is_video_url(parsed.pathname)) { } else if (show_media && is_video_url(parsed.pathname)) {
markup = html` markup = html`
<video controls class="inline-img" /> <video controls class="inline-img" />
<source src="${url}"> <source src="${url}">
</video> </video>`;
`;
} else { } else {
markup = html`<a target="_blank" rel="noopener noreferrer" href="${url}">${url}</a>`; markup = html`<a target="_blank" rel="noopener noreferrer" href="${url}">${url}</a>`;
} }
@ -32,7 +31,7 @@ function format_content(ev, show_media) {
return html`${ev.content.trim()}`; return html`${ev.content.trim()}`;
} }
const content = ev.content.trim(); const content = ev.content.trim();
const body = convert_quote_blocks(content, show_media) const body = fmt_body(content, show_media);
let cw = get_content_warning(ev.tags) let cw = get_content_warning(ev.tags)
if (cw !== null) { if (cw !== null) {
let cwHTML = "Content Warning" let cwHTML = "Content Warning"
@ -41,18 +40,18 @@ function format_content(ev, show_media) {
} else { } else {
cwHTML += html`: "<span>${cw}</span>".` cwHTML += html`: "<span>${cw}</span>".`
} }
return html` return `
<details class="cw"> <details class="cw">
<summary class="event-message">${cwHTML}</summary> <summary class="event-message">${cwHTML}</summary>
${body} ${body}
</details> </details>`;
`
} }
return body return body;
} }
function convert_quote_blocks(content, show_media) /* fmt_body will parse images, blockquotes, and sanitize the content.
{ */
function fmt_body(content, show_media) {
const split = content.split("\n") const split = content.split("\n")
let blockin = false let blockin = false
return split.reduce((str, line) => { return split.reduce((str, line) => {
@ -61,13 +60,13 @@ function convert_quote_blocks(content, show_media)
str += "<span class='quote'>" str += "<span class='quote'>"
blockin = true blockin = true
} }
str += linkify(line.slice(1), show_media) str += linkify(html`${line.slice(1)}`, show_media)
} else { } else {
if (blockin) { if (blockin) {
blockin = false blockin = false
str += "</span>" str += "</span>"
} }
str += linkify(line, show_media) str += linkify(html`${line}`, show_media)
} }
return str + "<br/>" return str + "<br/>"
}, "") }, "")