Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-04 15:58:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-12-04 15:24:26 -05:00
parent 64339e6149 5b60aee625
commit 45d2fe11dc
184 changed files with 1203 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/messaging/index.js
View File

@@ -234,7 +234,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
Messaging.generateUsernames = function (room, excludeUid) {
const users = room.users.filter(u => u && parseInt(u.uid, 10) !== excludeUid);
const usernames = users.map(u => u.username);
const usernames = users.map(u => u.displayname);
if (users.length > 3) {
return translator.compile(
'modules:chat.usernames-and-x-others',
@@ -248,8 +248,8 @@ Messaging.generateUsernames = function (room, excludeUid) {
Messaging.generateChatWithMessage = async function (room, callerUid, userLang) {
const users = room.users.filter(u => u && parseInt(u.uid, 10) !== callerUid);
const usernames = users.map(u => (utils.isNumber(u.uid) ?
`<a href="${relative_path}/uid/${u.uid}">${u.username}</a>` :
`<a href="${relative_path}/user/${u.username}">${u.username}</a>`));
`<a href="${relative_path}/uid/${u.uid}">${u.displayname}</a>` :
`<a href="${relative_path}/user/${u.username}">${u.displayname}</a>`));
let compiled = '';
if (!users.length) {
return '[[modules:chat.no-users-in-room]]';