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

fix: #8127 user join system message duplicated

Browse Source 
- Now showing user-join message for chat owner in addition to the newly
  added user
- If a modal already exists for a room when createModal is called, don't
  return null, return the modal
This commit is contained in:
Julian Lam
2020-01-21 13:57:06 -05:00
parent 106c141ff5
commit 594cd7e176
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/chat.js
View File

@@ -145,7 +145,7 @@ define('chat', [
require(['scrollStop', 'forum/chats', 'forum/chats/messages'], function (scrollStop, Chats, ChatsMessages) { require(['scrollStop', 'forum/chats', 'forum/chats/messages'], function (scrollStop, Chats, ChatsMessages) {
app.parseAndTranslate('chat', data, function (chatModal) { app.parseAndTranslate('chat', data, function (chatModal) {
if (module.modalExists(data.roomId)) { if (module.modalExists(data.roomId)) {
return callback(null); return callback(module.getModal(data.roomId));
} }
var uuid = utils.generateUUID(); var uuid = utils.generateUUID();
var dragged = false; var dragged = false;

1
src/messaging/rooms.js
View File

@@ -53,6 +53,7 @@ module.exports = function (Messaging) {
db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid), db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid),
]); ]);
await Promise.all([ await Promise.all([
Messaging.addSystemMessage('user-join', uid, roomId), // chat owner should also get the user-join system message
Messaging.addUsersToRoom(uid, toUids, roomId), Messaging.addUsersToRoom(uid, toUids, roomId),
Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now), Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now),
]); ]);