Skip to content

Node.js based forum software built for the modern web

fix: topic titles getting double escaped

Barış Soner Uşaklıda0f5c7ee47a
diff --git a/install/package.json b/install/package.json
index 3ebd88af9f..cdde8d7ec6 100644
--- a/install/package.json
+++ b/install/package.json
@@ -112,10 +112,10 @@
"nodebb-plugin-spam-be-gone": "2.3.3",
"nodebb-plugin-web-push": "0.7.10",
"nodebb-rewards-essentials": "1.0.3",
- "nodebb-theme-harmony": "3.0.4",
- "nodebb-theme-lavender": "8.0.3",
- "nodebb-theme-peace": "3.0.2",
- "nodebb-theme-persona": "15.0.4",
+ "nodebb-theme-harmony": "3.0.5",
+ "nodebb-theme-lavender": "8.0.4",
+ "nodebb-theme-peace": "3.0.3",
+ "nodebb-theme-persona": "15.0.5",
"nodebb-widget-essentials": "8.0.0",
"nodemailer": "8.0.11",
"nprogress": "0.2.0",
diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 11f33e8818..f6e127a768 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -207,12 +207,13 @@ define('forum/topic/events', [
const { isAdminOrMod } = ajaxify.data.privileges;
const isSelfPost = String(data.uid) === String(app.user.uid);
+ const canSeeDeleted = isAdminOrMod || isSelfPost;
const isDeleted = !!data.deleted;
if (postEl.length) {
postEl.toggleClass('deleted');
postTools.toggle(data.pid, isDeleted);
- if (!isAdminOrMod && !isSelfPost) {
+ if (!canSeeDeleted) {
postEl.find('[component="post/tools"]').toggleClass('hidden', isDeleted);
if (isDeleted) {
postEl.find('[component="post/content"]').translateText('[[topic:post-is-deleted]]');
@@ -223,7 +224,7 @@ define('forum/topic/events', [
}
const parentEl = $(`[component="post/parent"][data-parent-pid="${data.pid}"]`);
- if (parentEl.length) {
+ if (parentEl.length && !canSeeDeleted) {
parentEl.each((i, el) => {
const $parent = $(el);
if (isDeleted) {
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 029e931ed1..10b18321dc 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -35,6 +35,7 @@ module.exports = function (utils, Benchpress, tx, relative_path) {
min,
clamp,
quote,
+ renderTitle,
renderContent,
generateWroteReplied,
generateRepliedTo,
@@ -416,13 +417,18 @@ module.exports = function (utils, Benchpress, tx, relative_path) {
}
const deletedMsgs = new Set([
- '[[topic:topic-is-deleted]]',
'[[topic:post-is-deleted]]',
'[[modules:chat.message-deleted]]',
]);
+
+ function renderTitle(title, deleted = 0) {
+ const translateDeletedMsg = parseInt(deleted, 10) === 1 && title === '[[topic:topic-is-deleted]]';
+ return translateDeletedMsg ? _tx.call(this, title) : escape(title); // full escape on titles
+ }
+
function renderContent(content, deleted = 0) {
const translateDeletedMsg = parseInt(deleted, 10) === 1 && deletedMsgs.has(content);
- return translateDeletedMsg ? _tx.call(this, content) : tx.escape(content);
+ return translateDeletedMsg ? _tx.call(this, content) : tx.escape(content); // just tx.escape on html content
}
function generateWroteReplied(post, timeagoCutoff) {
diff --git a/src/topics/posts.js b/src/topics/posts.js
index 033703fba1..412d87c281 100644
--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@@ -200,7 +200,7 @@ module.exports = function (Topics) {
await Promise.all(parentPosts.map(async (parentPost) => {
const postPrivs = pidToPrivs[parentPost.pid];
if (parentPost.deleted && String(parentPost.uid) !== String(callerUid, 10) && !postPrivs['posts:view_deleted']) {
- parentPost.content = `<p>[[topic:post-is-deleted]]</p>`;
+ parentPost.content = `[[topic:post-is-deleted]]`;
return;
}
const foundPost = postData.find(p => String(p.pid) === String(parentPost.pid));
diff --git a/src/views/partials/chats/recent_room.tpl b/src/views/partials/chats/recent_room.tpl
index ba4403e7bc..17c96ee2a9 100644
--- a/src/views/partials/chats/recent_room.tpl
+++ b/src/views/partials/chats/recent_room.tpl
@@ -27,7 +27,7 @@
{{{ if !./lastUser.uid }}}
[[modules:chat.no-users-in-room]]
{{{ else }}}
- {tx(./usernames)}
+ {{tx(./usernames)}}
{{{ end }}}
{{{ end }}}
</div>