Merge pull request 'Decode html-encoded characters inside pre tags' (#101) from sfr/pleroma-fe:mfm-htmlencode into develop

Reviewed-on: AkkomaGang/pleroma-fe#101
2022-08-04 07:52:58 +00:00 · 2022-08-04 07:52:58 +00:00 · 9421aa1d39
parent 5873ee4e6c 6441ff45a9
commit 9421aa1d39
1 changed files with 9 additions and 2 deletions
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@ -124,11 +124,18 @@ export default {
    }

    const renderMisskeyMarkdown = (content) => {
-      // Untangle code blocks from <br> tags
+      // Untangle code blocks from <br> tags and other html encodings
      const codeblocks = content.match(/(<br\/>)?(~~~|```)\w*<br\/>.+?<br\/>\2\1?/g)
      if (codeblocks) {
        codeblocks.forEach((pre) => {
-          content = content.replace(pre, pre.replaceAll('<br/>', '\n'))
+          content = content.replace(pre,
+            pre.replaceAll('<br/>', '\n')
+               .replaceAll('&amp;', '&')
+               .replaceAll('&lt;', '<')
+               .replaceAll('&gt;', '>')
+               .replaceAll('&quot', '"')
+               .replaceAll('&#39;', "'")
+          )
        })
      }