Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #11717 prevent crash in messaging

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-06-15 15:33:36 -04:00
parent a757716ddd
commit 8620a2cd0a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/messaging/index.js
View File

@@ -111,7 +111,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
teasers: Promise.all(roomIds.map(async roomId => Messaging.getTeaser(uid, roomId))), teasers: Promise.all(roomIds.map(async roomId => Messaging.getTeaser(uid, roomId))),
}); });
results.roomData.forEach((room, index) => { await Promise.all(results.roomData.map(async (room, index) => {
if (room) { if (room) {
room.users = results.users[index]; room.users = results.users[index];
room.groupChat = room.hasOwnProperty('groupChat') ? room.groupChat : room.users.length > 2; room.groupChat = room.hasOwnProperty('groupChat') ? room.groupChat : room.users.length > 2;
@@ -125,12 +125,9 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
}); });
room.users = room.users.filter(user => user && parseInt(user.uid, 10)); room.users = room.users.filter(user => user && parseInt(user.uid, 10));
room.lastUser = room.users[0]; room.lastUser = room.users[0];
room.usernames = Messaging.generateUsernames(room.users, uid); room.usernames = Messaging.generateUsernames(room.users, uid);
}
});
await Promise.all(results.roomData.map(async (room) => {
room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid); room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
}
})); }));
results.roomData = results.roomData.filter(Boolean); results.roomData = results.roomData.filter(Boolean);