Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +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ı
2023-06-15 16:41:54 -04:00
parent f6059726e8 f10a2d2e98
commit a7375a85ba
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md
View File

@@ -1,3 +1,22 @@
#### v3.1.6 (2023-06-15)
##### Chores
* incrementing version number - v3.1.5 (ec19343a)
* update changelog for v3.1.5 (b0d16861)
* incrementing version number - v3.1.4 (2452783c)
* incrementing version number - v3.1.3 (3b4e9d3f)
* incrementing version number - v3.1.2 (40fa3489)
* incrementing version number - v3.1.1 (40250733)
* incrementing version number - v3.1.0 (0cb386bd)
* incrementing version number - v3.0.1 (26f6ea49)
* incrementing version number - v3.0.0 (224e08cd)
##### Bug Fixes
* #11717 prevent crash in messaging (8620a2cd)
* closes #11708, fix quick reply check (a757716d)
#### v3.1.5 (2023-06-13) #### v3.1.5 (2023-06-13)
##### Chores ##### Chores

2
install/package.json
View File

@@ -2,7 +2,7 @@
"name": "nodebb", "name": "nodebb",
"license": "GPL-3.0", "license": "GPL-3.0",
"description": "NodeBB Forum", "description": "NodeBB Forum",
"version": "3.1.5", "version": "3.1.6",
"homepage": "https://www.nodebb.org", "homepage": "https://www.nodebb.org",
"repository": { "repository": {
"type": "git", "type": "git",

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);
room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
} }
});
await Promise.all(results.roomData.map(async (room) => {
room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
})); }));
results.roomData = results.roomData.filter(Boolean); results.roomData = results.roomData.filter(Boolean);