cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-22 07:00:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: actually render HTML out instead of obliterating it

Browse source
This commit is contained in:
Paul Makles 2022-07-08 15:36:18 +01:00
parent 4a85dd69cf
commit 262b931810
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/components/markdown/RemarkRenderer.tsx
View file

@ -173,7 +173,12 @@ const Container = styled.div<{ largeEmoji: boolean }>`
/** /**
* Regex for matching execessive blockquotes * Regex for matching execessive blockquotes
*/ */
const RE_QUOTE = /(^[>\s][>\s])[>\s]+([^]+)$/gm; const RE_QUOTE = /(^[>\s][>\s])[>\s]+([^]+$)/gm;
/**
* Regex for matching open angled bracket
*/
const RE_OPEN_BRACKET = /</g;
/** /**
* Sanitise Markdown input before rendering * Sanitise Markdown input before rendering
@ -181,8 +186,15 @@ const RE_QUOTE = /(^[>\s][>\s])[>\s]+([^]+)$/gm;
* @returns Sanitised string * @returns Sanitised string
*/ */
function sanitise(content: string) { function sanitise(content: string) {
// Strip excessive blockquote indentation return (
return content.replace(RE_QUOTE, (_, m0, m1) => m0 + m1); content
// Strip excessive blockquote indentation
.replace(RE_QUOTE, (_, m0, m1) => m0 + m1)
// Map < to HTML entity LT
// (otherwise all HTML is just obliterated,
// not even displayed as plain text)
.replace(RE_OPEN_BRACKET, "&lt;")
);
} }
/** /**

2
src/components/markdown/plugins/mentions.tsx
View file

@ -12,6 +12,8 @@ const Mention = styled.a`
align-items: center; align-items: center;
display: inline-flex; display: inline-flex;
cursor: pointer;
font-weight: 600; font-weight: 600;
background: var(--secondary-background); background: var(--secondary-background);
border-radius: calc(var(--border-radius) * 2); border-radius: calc(var(--border-radius) * 2);