PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

use html parser rather than regexes

Browse source
This commit is contained in:
Aleks Kissinger 2020-10-14 22:16:28 +01:00
parent cc713aff72
commit 10b732131a
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/HtmlUtils.tsx
View file

@ -30,6 +30,7 @@ import url from 'url';
import katex from 'katex';
import { AllHtmlEntities } from 'html-entities';
import SettingsStore from './settings/SettingsStore';
import cheerio from 'cheerio';
import {MatrixClientPeg} from './MatrixClientPeg';
import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
@ -414,23 +415,20 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
if (isHtmlMessage) {
isDisplayedWithHtml = true;
safeBody = sanitizeHtml(formattedBody, sanitizeParams);
if (SettingsStore.getValue("feature_latex_maths")) {
const mathDelimiters = [
{ pattern: "<div data-mx-maths=\"([^\"]*)\">(.|\\s)*?</div>", display: true },
{ pattern: "<span data-mx-maths=\"([^\"]*)\">(.|\\s)*?</span>", display: false },
];
const phtml = cheerio.load(safeBody,
{ _useHtmlParser2: true, decodeEntities: false })
mathDelimiters.forEach(function(d) {
safeBody = safeBody.replace(RegExp(d.pattern, "gm"), function(m, p1) {
return katex.renderToString(
AllHtmlEntities.decode(p1),
{
throwOnError: false,
displayMode: d.display,
output: "htmlAndMathml",
})
});
if (SettingsStore.getValue("feature_latex_maths")) {
phtml('div, span[data-mx-maths!=""]').replaceWith(function(i, e) {
return katex.renderToString(
AllHtmlEntities.decode(phtml(e).attr('data-mx-maths')),
{
throwOnError: false,
displayMode: e.name == 'div',
output: "htmlAndMathml",
});
});
safeBody = phtml.html();
}
}
} finally {