diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 1adb9c03e2..49f1d221f6 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -259,4 +259,4 @@ define('forum/groups/details', [ } return Details; -}); +}); \ No newline at end of file diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 2d93bca847..06acacd520 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -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;