diff --git a/src/utils/enhance-content.js b/src/utils/enhance-content.js
index bf0ef916..c91c6328 100644
--- a/src/utils/enhance-content.js
+++ b/src/utils/enhance-content.js
@@ -41,7 +41,10 @@ function enhanceContent(content, opts = {}) {
// Convert :shortcode: to
let textNodes = extractTextNodes(dom);
textNodes.forEach((node) => {
- let html = node.nodeValue.replace(//g, '>');
+ let html = node.nodeValue
+ .replace(/&/g, '&')
+ .replace(//g, '>');
if (emojis) {
html = emojifyText(html, emojis);
}
@@ -106,7 +109,10 @@ function enhanceContent(content, opts = {}) {
// Convert `code` to code
textNodes = extractTextNodes(dom);
textNodes.forEach((node) => {
- let html = node.nodeValue.replace(//g, '>');
+ let html = node.nodeValue
+ .replace(/&/g, '&')
+ .replace(//g, '>');
if (/`[^`]+`/g.test(html)) {
html = html.replaceAll(/(`[^]+?`)/g, '$1
');
}
@@ -122,7 +128,10 @@ function enhanceContent(content, opts = {}) {
rejectFilter: ['A'],
});
textNodes.forEach((node) => {
- let html = node.nodeValue.replace(//g, '>');
+ let html = node.nodeValue
+ .replace(/&/g, '&')
+ .replace(//g, '>');
if (/@[a-zA-Z0-9_]+@twitter\.com/g.test(html)) {
html = html.replaceAll(
/(@([a-zA-Z0-9_]+)@twitter\.com)/g,