Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 09:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-08-22 15:06:53 -04:00
parent daa665ebc0 ad68809bb4
commit e3bfcb0230
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -35,7 +35,7 @@
"@isaacs/ttlcache": "1.4.1",
"@nodebb/spider-detector": "2.0.3",
"@popperjs/core": "2.11.8",
"ace-builds": "1.35.5",
"ace-builds": "1.36.0",
"archiver": "7.0.1",
"async": "3.2.6",
"autoprefixer": "10.4.20",

2
src/notifications.js
View File

@@ -479,7 +479,7 @@ 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.username));
const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname));
const numUsers = usernames.length;
const title = utils.decodeHTMLEntities(notifications[modifyIndex].topicTitle || '');