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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2026-03-11 12:31:51 -04:00
parent 3ebac6f0d4 e1d0e2a0db
commit b835eef91f
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/notifications.js
View File

@@ -549,13 +549,18 @@ Notifications.merge = async function (notifications) {
}
case 'notifications:user-posted-in-public-room': {
const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname));
if (usernames.length === 2 || usernames.length === 3) {
notifObj.bodyShort = `[[${mergeId}-${typeFromLength(usernames)}, ${usernames.join(', ')}, ${notifObj.roomIcon}, ${notifObj.roomName}]]`;
} else if (usernames.length > 3) {
notifObj.bodyShort = `[[${mergeId}-${typeFromLength(usernames)}, ${usernames.slice(0, 2).join(', ')}, ${usernames.length - 2}, ${notifObj.roomIcon}, ${notifObj.roomName}]]`;
}
const usernames = _.uniq(set.map(n => n?.user?.displayname)).filter(Boolean);
const type = typeFromLength(usernames);
const isMultiple = type === 'multiple';
const txArgs = [
`${mergeId}-${type}`,
usernames.slice(0, usernames.length <= 3 ? 3 : 2).join(', '),
...(isMultiple ? [usernames.length - 2] : []),
notifObj.roomIcon,
notifObj.roomName,
];
notifObj.bodyShort = translator.compile(...txArgs);
notifObj.path = set[set.length - 1].path;
break;
}
@@ -565,11 +570,16 @@ Notifications.merge = async function (notifications) {
case 'notifications:user-flagged-post-in':
case 'notifications:user-flagged-user':
case 'notifications:activitypub.announce': {
const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname));
const txKey = `${mergeId}-${typeFromLength(usernames)}`;
const displayNames = usernames.slice(0, usernames.length <= 3 ? 3 : 2).join(', ');
const title = utils.decodeHTMLEntities(notifObj.topicTitle || '');
notifObj.bodyShort = translator.compile(txKey, displayNames, title || '');
const usernames = _.uniq(set.map(n => n?.user?.displayname)).filter(Boolean);
const type = typeFromLength(usernames);
const isMultiple = type === 'multiple';
const txArgs = [
`${mergeId}-${type}`,
usernames.slice(0, usernames.length <= 3 ? 3 : 2).join(', '),
...(isMultiple ? [usernames.length - 2] : []),
utils.decodeHTMLEntities(notifObj.topicTitle || ''),
];
notifObj.bodyShort = translator.compile(...txArgs);
notifObj.path = set[set.length - 1].path;
break;
}