Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 03:21:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add topic-await-review notif text

Browse Source 
add bodyEmail, use it for email body if provided, otherwise fallback to bodyLong as usual
change mergeId of post queue notifs so they are not all merged into one.
This commit is contained in:
Barış Soner Uşaklı
2026-02-26 16:04:07 -05:00
parent 50f5541ef7
commit bac9f1f73c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/notifications.json
View File

@@ -72,6 +72,7 @@
"new-register-multiple": "There are <strong>%1</strong> registration requests awaiting review.", "new-register-multiple": "There are <strong>%1</strong> registration requests awaiting review.",
"flag-assigned-to-you": "<strong>Flag %1</strong> has been assigned to you", "flag-assigned-to-you": "<strong>Flag %1</strong> has been assigned to you",
"post-awaiting-review": "Post awaiting review", "post-awaiting-review": "Post awaiting review",
"topic-awaiting-review": "Topic awaiting review",
"profile-exported": "<strong>%1</strong> profile exported, click to download", "profile-exported": "<strong>%1</strong> profile exported, click to download",
"posts-exported": "<strong>%1</strong> posts exported, click to download", "posts-exported": "<strong>%1</strong> posts exported, click to download",
"uploads-exported": "<strong>%1</strong> uploads exported, click to download", "uploads-exported": "<strong>%1</strong> uploads exported, click to download",

2
src/notifications.js
View File

@@ -329,7 +329,7 @@ async function sendEmail({ uids, notification }, cacheKey, reason) {
if (['new-reply', 'new-chat'].includes(notification.type)) { if (['new-reply', 'new-chat'].includes(notification.type)) {
notification['cta-type'] = notification.type; notification['cta-type'] = notification.type;
} }
let body = notification.bodyLong || ''; let body = notification.bodyEmail || notification.bodyLong || '';
if (meta.config.removeEmailNotificationImages) { if (meta.config.removeEmailNotificationImages) {
body = body.replace(/<img[^>]*>/, ''); body = body.replace(/<img[^>]*>/, '');
} }

15
src/posts/queue.js
View File

@@ -201,14 +201,19 @@ module.exports = function (Posts) {
await plugins.hooks.fire('action:post-queue.save', payload); await plugins.hooks.fire('action:post-queue.save', payload);
const cid = await getCid(type, data); const cid = await getCid(type, data);
const uids = await getNotificationUids(cid); const uids = await getNotificationUids(cid);
const bodyLong = await parseBodyLong(cid, type, data); const bodyEmail = await parseBodyEmail(cid, type, data);
const notifObj = await notifications.create({ const notifObj = await notifications.create({
type: 'post-queue', type: 'post-queue',
nid: `post-queue-${id}`, nid: `post-queue-${id}`,
mergeId: 'post-queue', mergeId: `post-queue-${type}-uid-${data.uid}`,
bodyShort: '[[notifications:post-awaiting-review]]', bodyShort: type === 'reply' ?
bodyLong: bodyLong, '[[notifications:post-awaiting-review]]' :
'[[notifications:topic-awaiting-review]]',
bodyLong: type === 'reply' ?
await plugins.hooks.fire('filter:parse.raw', data.content) :
validator.escape(String(data.title)),
bodyEmail: bodyEmail,
path: `/post-queue/${id}`, path: `/post-queue/${id}`,
from: data.uid, from: data.uid,
}); });
@@ -221,7 +226,7 @@ module.exports = function (Posts) {
}; };
}; };
async function parseBodyLong(cid, type, data) { async function parseBodyEmail(cid, type, data) {
const url = nconf.get('url'); const url = nconf.get('url');
const [content, category, userData] = await Promise.all([ const [content, category, userData] = await Promise.all([
plugins.hooks.fire('filter:parse.raw', data.content), plugins.hooks.fire('filter:parse.raw', data.content),