Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

app.user

Browse Source
This commit is contained in:
barisusakli
2014-12-03 19:36:19 -05:00
parent 22e20b961e
commit 7ae7c50f56
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ function onConnect(socket) {
async.parallel({
user: function(next) {
user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status'], next);
user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status', 'email:confirmed'], next);
},
isAdmin: function(next) {
user.isAdministrator(socket.uid, next);
@@ -74,13 +74,10 @@ function onConnect(socket) {
if (err || !userData.user) {
return;
}
socket.emit('event:connect', {
username: userData.user.username,
userslug: userData.user.userslug,
picture: userData.user.picture,
isAdmin: userData.isAdmin,
uid: socket.uid
});
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);
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.user.status});
});