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

more refactors

Browse Source
This commit is contained in:
barisusakli
2015-09-25 17:38:58 -04:00
parent 1f4857585d
commit 5950f97f96
28 changed files with 235 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket.io/admin/user.js
View File

@@ -16,7 +16,7 @@ User.makeAdmins = function(socket, uids, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
user.getMultipleUserFields(uids, ['banned'], function(err, userData) {
user.getUsersFields(uids, ['banned'], function(err, userData) {
if (err) {
return callback(err);
}
@@ -133,7 +133,7 @@ User.sendValidationEmail = function(socket, uids, callback) {
return callback(new Error('[[error:email-confirmations-are-disabled]]'));
}
user.getMultipleUserFields(uids, ['uid', 'email'], function(err, usersData) {
user.getUsersFields(uids, ['uid', 'email'], function(err, usersData) {
if (err) {
return callback(err);
}
@@ -216,7 +216,7 @@ User.search = function(socket, data, callback) {
async.parallel({
users: function(next) {
user.getMultipleUserFields(uids, ['email'], next);
user.getUsersFields(uids, ['email'], next);
},
flagCounts: function(next) {
var sets = uids.map(function(uid) {

2
src/socket.io/categories.js
View File

@@ -121,7 +121,7 @@ SocketCategories.getTopicCount = function(socket, cid, callback) {
SocketCategories.getUsersInCategory = function(socket, cid, callback) {
var uids = websockets.getUidsInRoom('category_' + cid);
user.getMultipleUserFields(uids, ['uid', 'userslug', 'username', 'picture'], callback);
user.getUsersFields(uids, ['uid', 'userslug', 'username', 'picture'], callback);
};
SocketCategories.getCategoriesByPrivilege = function(socket, privilege, callback) {

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

@@ -281,7 +281,7 @@ Sockets.getUsersInRoom = function (uid, roomName, start, stop, callback) {
if (!uids.length) {
return callback(null, {users: [], total: 0 , room: roomName});
}
user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture', 'status'], function(err, users) {
user.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture', 'status'], function(err, users) {
if (err) {
return callback(err);
}

4
src/socket.io/posts/favourites.js
View File

@@ -37,13 +37,13 @@ module.exports = function(SocketPosts) {
function (results, next) {
async.parallel({
upvoters: function(next) {
user.getMultipleUserFields(results.upvoteUids, ['username', 'userslug', 'picture'], next);
user.getUsersFields(results.upvoteUids, ['username', 'userslug', 'picture'], next);
},
upvoteCount: function(next) {
next(null, results.upvoteUids.length);
},
downvoters: function(next) {
user.getMultipleUserFields(results.downvoteUids, ['username', 'userslug', 'picture'], next);
user.getUsersFields(results.downvoteUids, ['username', 'userslug', 'picture'], next);
},
downvoteCount: function(next) {
next(null, results.downvoteUids.length);