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

Merge remote-tracking branch 'origin/master' into 0.5.1

Browse Source
This commit is contained in:
barisusakli
2014-08-14 07:52:11 -04:00
parent c9c454825e 2d0637d7c6
commit d0d1ebb28c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket.io/index.js
View File

@@ -93,8 +93,8 @@ Sockets.init = function(server) {
uid: uid uid: uid
}); });
socketUser.isOnline(socket, [uid], function(err, data) { socketUser.isOnline(socket, uid, function(err, data) {
socket.broadcast.emit('user.isOnline', err, data[0]); socket.broadcast.emit('user.isOnline', err, data);
}); });
}); });
}); });
@@ -114,8 +114,8 @@ Sockets.init = function(server) {
if (uid && Sockets.getUserSockets(uid).length <= 1) { if (uid && Sockets.getUserSockets(uid).length <= 1) {
db.sortedSetRemove('users:online', uid, function(err) { db.sortedSetRemove('users:online', uid, function(err) {
socketUser.isOnline(socket, [uid], function(err, data) { socketUser.isOnline(socket, uid, function(err, data) {
socket.broadcast.emit('user.isOnline', err, data[0]); socket.broadcast.emit('user.isOnline', err, data);
}); });
}); });
} }

12
src/socket.io/user.js
View File

@@ -81,7 +81,9 @@ SocketUser.reset.commit = function(socket, data, callback) {
}; };
SocketUser.isOnline = function(socket, uid, callback) { SocketUser.isOnline = function(socket, uid, callback) {
user.isOnline(uid, callback); user.isOnline([uid], function(err, data) {
callback(err, Array.isArray(data) ? data[0] : null);
});
}; };
SocketUser.changePassword = function(socket, data, callback) { SocketUser.changePassword = function(socket, data, callback) {
@@ -247,7 +249,7 @@ SocketUser.getOnlineUsers = function(socket, uids, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
SocketUser.isOnline(socket, uids, function(err, userData) { user.isOnline(uids, function(err, userData) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -316,9 +318,9 @@ SocketUser.loadMore = function(socket, data, callback) {
SocketUser.setStatus = function(socket, status, callback) { SocketUser.setStatus = function(socket, status, callback) {
var server = require('./index'); var server = require('./index');
user.setUserField(socket.uid, 'status', status, function(err) { user.setUserField(socket.uid, 'status', status, function(err) {
SocketUser.isOnline(socket, [socket.uid], function(err, data) { SocketUser.isOnline(socket, socket.uid, function(err, data) {
server.server.sockets.emit('user.isOnline', err, data[0]); server.server.sockets.emit('user.isOnline', err, data);
callback(err, data[0]); callback(err, data);
}); });
}); });
}; };