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

Merge commit '8620a2cd0ad4281dda10877fed5a5020d4bd7b8d' into v3.x

Browse Source
This commit is contained in:
Misty Release Bot
2023-06-15 19:45:02 +00:00
parent ec19343a08 8620a2cd0a
commit 4688861749
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
CHANGELOG.md
View File

@@ -1,3 +1,39 @@
#### v3.1.5 (2023-06-13)
##### Chores
* fix persona (74174414)
* up themes (97ff1f11)
* incrementing version number - v3.1.4 (2452783c)
* update changelog for v3.1.4 (633dc2de)
* 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)
##### New Features
* add back support for req.body._csrf (67f44a32)
##### Bug Fixes
* improper neutralization of user input in image wrapping code (1d1639d4)
* don't update edit data if edited timestamp is not available (c5cd76e7)
* filter null nav items (b73f307a)
* rimraf usage in user image delete (3256fb30)
* closes #11620, fix copy code when line numbers are enabled (82e26829)
* logins dashboard user images (8cb6ebb9)
##### Refactors
* change welcome headers to be smaller (0c4870ec)
##### Tests
* remove socket.io test (24ebb153)
#### v3.1.4 (2023-05-18)
##### Chores

2
public/src/client/topic.js
View File

@@ -371,7 +371,7 @@ define('forum/topic', [
}
function setupQuickReply() {
if (config.enableQuickReply || config.theme.enableQuickReply) {
if (config.enableQuickReply || (config.theme && config.theme.enableQuickReply)) {
quickreply.init();
}
}

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))),
});
results.roomData.forEach((room, index) => {
await Promise.all(results.roomData.map(async (room, index) => {
if (room) {
room.users = results.users[index];
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.lastUser = room.users[0];
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);