This commit is contained in:
Barış Soner Uşaklı
2015-02-11 12:54:54 -05:00
parent 8a581ed1dd
commit d20628a8d4
13 changed files with 38 additions and 62 deletions

View File

@@ -66,32 +66,19 @@ function onConnect(socket) {
socket.join('uid_' + socket.uid);
socket.join('online_users');
async.parallel({
user: function(next) {
user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status', 'email:confirmed'], next);
},
isAdmin: function(next) {
user.isAdministrator(socket.uid, next);
}
}, function(err, userData) {
if (err || !userData.user) {
user.getUserFields(socket.uid, ['status'], function(err, userData) {
if (err || !userData) {
return;
}
userData.user.uid = socket.uid;
userData.user.isAdmin = userData.isAdmin;
userData.user['email:confirmed'] = parseInt(userData.user['email:confirmed'], 10) === 1;
socket.emit('event:connect', userData.user);
if (userData.user.status !== 'offline') {
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.user.status || 'online'});
socket.emit('event:connect');
if (userData.status !== 'offline') {
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'});
}
});
} else {
socket.join('online_guests');
socket.emit('event:connect', {
username: '[[global:guest]]',
isAdmin: false,
uid: 0
});
socket.emit('event:connect');
}
}