Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-25 20:01:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

removing additional socket methods added via #4304

Browse Source 
@barisusakli added these methods in 8d9f7d8e19
This commit is contained in:
Julian Lam
2016-03-18 15:35:35 -04:00
parent 3d815fff72
commit 1736b1c015
2 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/groups/details.js
View File

@@ -259,4 +259,4 @@ define('forum/groups/details', [
}
return Details;
});
});

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

@@ -350,45 +350,4 @@ SocketUser.getUserByEmail = function(socket, email, callback) {
};
SocketUser.getUserByUID = getUserByUID;
function getUserByUID(socket, uid, callback) {
async.parallel({
userData: async.apply(user.getUserData, uid),
settings: async.apply(user.getSettings, uid)
}, function(err, results) {
if (err || !results.userData) {
return callback(err||new Error('[[error:no-user]]'));
}
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
callback(null,results.userData);
});
}
SocketUser.getUserByUsername = function(socket, username, callback) {
async.waterfall([
function(next) {
user.getUidByUsername(username || 0, next);
},
function(uid, next) {
getUserByUID(socket, uid, next);
}
], callback);
};
SocketUser.getUserByEmail = function(socket, email, callback) {
async.waterfall([
function(next) {
user.getUidByEmail(email || 0, next);
},
function(uid, next) {
getUserByUID(socket, uid, next);
}
], callback);
};
module.exports = SocketUser;