This commit is contained in:
barisusakli
2014-04-24 16:19:31 -04:00
parent 6f2ea3eafc
commit 7339cb5d61
2 changed files with 21 additions and 9 deletions

View File

@@ -354,25 +354,24 @@ var bcrypt = require('bcryptjs'),
};
User.isOnline = function(uid, callback) {
User.getUserField(uid, 'status', function(err, status) {
User.getUserFields(uid, ['username', 'userslug', 'picture', 'status'] , function(err, data) {
if(err) {
return callback(err);
}
var online = require('./socket.io').isUserOnline(uid);
status = online ? (status || 'online') : 'offline';
data.status = online ? (data.status || 'online') : 'offline';
if(status === 'offline') {
if(data.status === 'offline') {
online = false;
}
callback(null, {
online: online,
uid: uid,
timestamp: Date.now(),
status: status
});
data.online = online;
data.uid = uid;
data.timestamp = Date.now();
callback(null, data);
});
};