Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed end to stop globally

Browse Source 
fixed getting favourites for admins
This commit is contained in:
barisusakli
2015-03-31 23:40:58 -04:00
parent 27bab3330a
commit 878e548296
26 changed files with 160 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,7 +397,7 @@ SocketUser.getUnreadChatCount = function(socket, data, callback) {
};
SocketUser.loadMore = function(socket, data, callback) {
if(!data || !data.set || parseInt(data.after, 10) < 0) {
if (!data || !data.set || parseInt(data.after, 10) < 0) {
return callback(new Error('[[error:invalid-data]]'));
}
@@ -406,28 +406,30 @@ SocketUser.loadMore = function(socket, data, callback) {
}
var start = parseInt(data.after, 10),
end = start + 19;
stop = start + 19;
user.getUsersFromSet(data.set, socket.uid, start, end, function(err, userData) {
async.parallel({
isAdmin: function(next) {
user.isAdministrator(socket.uid, next);
},
users: function(next) {
user.getUsersFromSet(data.set, socket.uid, start, stop, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
user.isAdministrator(socket.uid, function (err, isAdministrator) {
if (err) {
return callback(err);
}
if (!isAdministrator && data.set === 'users:online') {
userData = userData.filter(function(item) {
return item.status !== 'offline';
});
}
callback(null, {
users: userData,
nextStart: end + 1
if (!results.isAdmin && data.set === 'users:online') {
results.users = results.users.filter(function(user) {
return user.status !== 'offline';
});
}
callback(null, {
users: results.users,
nextStart: stop + 1
});
});
};