ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Composer: Do not parse Markdown inside code block (#1986)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-08-07 18:28:50 +02:00
parent 2295c21376
commit f6a111b521
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/parseMessageInput.ts
View File

@ -85,24 +85,27 @@ function parseMarkdown(html: string) {
parsedHtml = parsedHtml.replace(/[`]{3}([^`]+)[`]{3}/g, '<pre>$1</pre>'); parsedHtml = parsedHtml.replace(/[`]{3}([^`]+)[`]{3}/g, '<pre>$1</pre>');
// Code // Code
parsedHtml = parsedHtml.replace(/[`]{1}([^`\n]+)[`]{1}/g, '<code>$1</code>'); parsedHtml = parsedHtml.replace(
/(?!<(code|pre)[^<]*|<\/)[`]{1}([^`\n]+)[`]{1}(?![^<]*<\/(code|pre)>)/g,
'<code>$2</code>',
);
// Other simple markdown // Other simple markdown
parsedHtml = parsedHtml.replace( parsedHtml = parsedHtml.replace(
/(^|\s)(?!<code[^<]*|<\/)[*]{2}([^*\n]+)[*]{2}(?![^<]*<\/code>)(\s|$)/g, /(^|\s)(?!<(code|pre)[^<]*|<\/)[*]{2}([^*\n]+)[*]{2}(?![^<]*<\/(code|pre)>)(\s|$)/g,
'$1<b>$2</b>$3', '$1<b>$3</b>$5',
); );
parsedHtml = parsedHtml.replace( parsedHtml = parsedHtml.replace(
/(^|\s)(?!<code[^<]*|<\/)[_]{2}([^_\n]+)[_]{2}(?![^<]*<\/code>)(\s|$)/g, /(^|\s)(?!<(code|pre)[^<]*|<\/)[_]{2}([^_\n]+)[_]{2}(?![^<]*<\/(code|pre)>)(\s|$)/g,
'$1<i>$2</i>$3', '$1<i>$3</i>$5',
); );
parsedHtml = parsedHtml.replace( parsedHtml = parsedHtml.replace(
/(^|\s)(?!<code[^<]*|<\/)[~]{2}([^~\n]+)[~]{2}(?![^<]*<\/code>)(\s|$)/g, /(^|\s)(?!<(code|pre)[^<]*|<\/)[~]{2}([^~\n]+)[~]{2}(?![^<]*<\/(code|pre)>)(\s|$)/g,
'$1<s>$2</s>$3', '$1<s>$3</s>$5',
); );
parsedHtml = parsedHtml.replace( parsedHtml = parsedHtml.replace(
/(^|\s)(?!<code[^<]*|<\/)[|]{2}([^|\n]+)[|]{2}(?![^<]*<\/code>)(\s|$)/g, /(^|\s)(?!<(code|pre)[^<]*|<\/)[|]{2}([^|\n]+)[|]{2}(?![^<]*<\/(code|pre)>)(\s|$)/g,
`$1<span data-entity-type="${ApiMessageEntityTypes.Spoiler}">$2</span>$3`, `$1<span data-entity-type="${ApiMessageEntityTypes.Spoiler}">$3</span>$5`,
); );
return parsedHtml; return parsedHtml;