Node.js based forum software built for the modern web
refactor: remove renderTitle/renderContent
Barış Soner Uşaklı4f4a97a904b1
diff --git a/install/package.json b/install/package.jsonindex 0a44d99203..cd1c67f23c 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.8",- "nodebb-theme-lavender": "8.0.4",- "nodebb-theme-peace": "3.0.4",- "nodebb-theme-persona": "15.0.7",+ "nodebb-theme-harmony": "3.0.9",+ "nodebb-theme-lavender": "8.0.5",+ "nodebb-theme-peace": "3.0.5",+ "nodebb-theme-persona": "15.0.8","nodebb-widget-essentials": "8.0.0","nodemailer": "8.0.11","nprogress": "0.2.0",diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex d6c5ec47ab..a9239d6b96 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -35,8 +35,6 @@ module.exports = function (utils, Benchpress, tx, relative_path) {min,clamp,quote,- renderTitle,- renderContent,generateWroteReplied,generateRepliedTo,generateWrote,@@ -417,21 +415,6 @@ module.exports = function (utils, Benchpress, tx, relative_path) {return `"${str}"`;}- const deletedMsgs = new Set([- '[[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); // just tx.escape on html content- }-function generateWroteReplied(post, timeagoCutoff) {if (post.toPid) {return generateRepliedTo.call(this, post, timeagoCutoff);diff --git a/src/api/posts.js b/src/api/posts.jsindex 76df895b90..2d221673d8 100644--- a/src/api/posts.js+++ b/src/api/posts.js@@ -39,6 +39,7 @@ postsAPI.get = async function (caller, data) {const selfPost = caller.uid && caller.uid === parseInt(post.uid, 10);if (post.deleted && !(userPrivilege.isAdminOrMod || selfPost)) {post.content = '[[topic:post-is-deleted]]';+ post.txContent = true;}return post;diff --git a/src/categories/topics.js b/src/categories/topics.jsindex dd84887c9b..b888be0b47 100644--- a/src/categories/topics.js+++ b/src/categories/topics.js@@ -169,6 +169,7 @@ module.exports = function (Categories) {topics.forEach((topic) => {if (topic && !topic.scheduled && topic.deleted && !topic.isOwner) {topic.title = '[[topic:topic-is-deleted]]';+ topic.txTitle = true;topic.slug = topic.tid;topic.teaser = null;topic.noAnchor = true;diff --git a/src/messaging/data.js b/src/messaging/data.jsindex e13043a944..893606eefd 100644--- a/src/messaging/data.js+++ b/src/messaging/data.js@@ -147,6 +147,7 @@ module.exports = function (Messaging) {await Promise.all(parentMessages.map(async (parentMsg) => {if (parentMsg.deleted && parentMsg.fromuid !== parseInt(uid, 10)) {parentMsg.content = `[[modules:chat.message-deleted]]`;+ parentMsg.txContent = true;return;}const foundMsg = messages.find(msg => parseInt(msg.mid, 10) === parseInt(parentMsg.mid, 10));@@ -177,6 +178,7 @@ module.exports = function (Messaging) {await Promise.all(messages.map(async (msg) => {if (msg.deleted && !msg.isOwner) {msg.content = `[[modules:chat.message-deleted]]`;+ msg.txContent = true;return;}msg.content = await parseMessage(msg, uid, roomId, isNew);diff --git a/src/posts/index.js b/src/posts/index.jsindex 59c61381b9..53c3c4c334 100644--- a/src/posts/index.js+++ b/src/posts/index.js@@ -98,6 +98,7 @@ Posts.getPostIndices = async function (posts, uid) {Posts.modifyPostByPrivilege = function (post, privileges) {if (post && post.deleted && !(post.selfPost || privileges['posts:view_deleted'])) {post.content = '[[topic:post-is-deleted]]';+ post.txContent = true;if (post.user) {post.user.signature = '';}diff --git a/src/topics/posts.js b/src/topics/posts.jsindex 412d87c281..512b7f63d7 100644--- a/src/topics/posts.js+++ b/src/topics/posts.js@@ -201,6 +201,7 @@ module.exports = function (Topics) {const postPrivs = pidToPrivs[parentPost.pid];if (parentPost.deleted && String(parentPost.uid) !== String(callerUid, 10) && !postPrivs['posts:view_deleted']) {parentPost.content = `[[topic:post-is-deleted]]`;+ parentPost.txContent = true;return;}const foundPost = postData.find(p => String(p.pid) === String(parentPost.pid));diff --git a/src/views/partials/chats/message.tpl b/src/views/partials/chats/message.tplindex 8c352333d3..f9b0cba99d 100644--- a/src/views/partials/chats/message.tpl+++ b/src/views/partials/chats/message.tpl@@ -19,7 +19,7 @@</div><div class="message-body-wrapper"><div component="chat/message/body" class="message-body ps-0 py-0 text-break mb-last-0 mb-3">- {{renderContent(messages.content, messages.deleted)}}+ {{{ if messages.txContent }}}{{tx(messages.content)}}{{{ else }}}{{messages.content}}{{{ end }}}</div><!-- IMPORT partials/chats/reactions.tpl --><div component="chat/message/controls" class="position-relative">