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

remove since properly

Browse Source
This commit is contained in:
barisusakli
2016-10-03 22:18:47 +03:00
parent a9cb582c70
commit aca0a893e7
6 changed files with 117 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/socket.io/modules.js
View File

@@ -115,11 +115,18 @@ SocketModules.chats.loadRoom = function(socket, data, callback) {
async.parallel({
roomData: async.apply(Messaging.getRoomData, data.roomId),
users: async.apply(Messaging.getUsersInRoom, data.roomId, 0, -1)
users: async.apply(Messaging.getUsersInRoom, data.roomId, 0, -1),
messages: async.apply(Messaging.getMessages, {
callerUid: socket.uid,
uid: data.uid || socket.uid,
roomId: data.roomId,
isNew: false
}),
}, next);
},
function (results, next) {
results.roomData.users = results.users;
results.roomData.messages = results.messages;
results.roomData.groupChat = results.roomData.hasOwnProperty('groupChat') ? results.roomData.groupChat : results.users.length > 2;
results.roomData.isOwner = parseInt(results.roomData.owner, 10) === socket.uid;
results.roomData.maximumUsersInChatRoom = parseInt(meta.config.maximumUsersInChatRoom, 10) || 0;
@@ -312,10 +319,6 @@ SocketModules.chats.getMessages = function(socket, data, callback) {
markRead: false
};
if (data.hasOwnProperty('since')) {
params.since = data.since;
}
if (data.hasOwnProperty('markRead')) {
params.markRead = data.markRead;
}