hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(socket.io-groups): Allow first page of members to be retrieved via websockets

Browse Source 
previously requesting the first page of members of a group failed
v1.18.x
Accalia de Elementia
parent 6c11709cf1
commit 413517a084
1 changed files with 43 additions and 39 deletions

82
src/socket.io/groups.js
Unescape Escape View File

@ -1,23 +1,24 @@
"use strict"; "use strict";
var async = require('async'), var async = require('async'),
groups = require('../groups'), groups = require('../groups'),
meta = require('../meta'), meta = require('../meta'),
user = require('../user'), user = require('../user'),
utils = require('../../../public/src/utils'),
groupsController = require('../controllers/groups'), groupsController = require('../controllers/groups'),
SocketGroups = {}; SocketGroups = {};
SocketGroups.before = function(socket, method, data, next) { SocketGroups.before = function (socket, method, data, next) {
if (!data) { if (!data) {
return next(new Error('[[error:invalid-data]]')); return next(new Error('[[error:invalid-data]]'));
} }
next(); next();
}; };
SocketGroups.join = function(socket, data, callback) { SocketGroups.join = function (socket, data, callback) {
if (!parseInt(socket.uid, 10)) { if (!parseInt(socket.uid, 10)) {
return callback(new Error('[[error:invalid-uid]]')); return callback(new Error('[[error:invalid-uid]]'));
} }
@ -26,7 +27,7 @@ SocketGroups.join = function(socket, data, callback) {
return callback(new Error('[[error:not-allowed]]')); return callback(new Error('[[error:not-allowed]]'));
} }
groups.exists(data.groupName, function(err, exists) { groups.exists(data.groupName, function (err, exists) {
if (err || !exists) { if (err || !exists) {
return callback(err || new Error('[[error:no-group]]')); return callback(err || new Error('[[error:no-group]]'));
} }
@ -38,7 +39,7 @@ SocketGroups.join = function(socket, data, callback) {
async.parallel({ async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid), isAdmin: async.apply(user.isAdministrator, socket.uid),
groupData: async.apply(groups.getGroupData, data.groupName) groupData: async.apply(groups.getGroupData, data.groupName)
}, function(err, results) { }, function (err, results) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -56,7 +57,7 @@ SocketGroups.join = function(socket, data, callback) {
}); });
}; };
SocketGroups.leave = function(socket, data, callback) { SocketGroups.leave = function (socket, data, callback) {
if (!parseInt(socket.uid, 10)) { if (!parseInt(socket.uid, 10)) {
return callback(new Error('[[error:invalid-uid]]')); return callback(new Error('[[error:invalid-uid]]'));
} }
@ -73,7 +74,7 @@ function isOwner(next) {
async.parallel({ async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid), isAdmin: async.apply(user.isAdministrator, socket.uid),
isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName) isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName)
}, function(err, results) { }, function (err, results) {
if (err || (!isOwner && !results.isAdmin)) { if (err || (!isOwner && !results.isAdmin)) {
return callback(err || new Error('[[error:no-privileges]]')); return callback(err || new Error('[[error:no-privileges]]'));
} }
@ -84,7 +85,7 @@ function isOwner(next) {
function isInvited(next) { function isInvited(next) {
return function (socket, data, callback) { return function (socket, data, callback) {
groups.isInvited(socket.uid, data.groupName, function(err, invited) { groups.isInvited(socket.uid, data.groupName, function (err, invited) {
if (err || !invited) { if (err || !invited) {
return callback(err || new Error('[[error:not-invited]]')); return callback(err || new Error('[[error:not-invited]]'));
} }
@ -93,70 +94,70 @@ function isInvited(next) {
}; };
} }
SocketGroups.grant = isOwner(function(socket, data, callback) { SocketGroups.grant = isOwner(function (socket, data, callback) {
groups.ownership.grant(data.toUid, data.groupName, callback); groups.ownership.grant(data.toUid, data.groupName, callback);
}); });
SocketGroups.rescind = isOwner(function(socket, data, callback) { SocketGroups.rescind = isOwner(function (socket, data, callback) {
groups.ownership.rescind(data.toUid, data.groupName, callback); groups.ownership.rescind(data.toUid, data.groupName, callback);
}); });
SocketGroups.accept = isOwner(function(socket, data, callback) { SocketGroups.accept = isOwner(function (socket, data, callback) {
groups.acceptMembership(data.groupName, data.toUid, callback); groups.acceptMembership(data.groupName, data.toUid, callback);
}); });
SocketGroups.reject = isOwner(function(socket, data, callback) { SocketGroups.reject = isOwner(function (socket, data, callback) {
groups.rejectMembership(data.groupName, data.toUid, callback); groups.rejectMembership(data.groupName, data.toUid, callback);
}); });
SocketGroups.acceptAll = isOwner(function(socket, data, callback) { SocketGroups.acceptAll = isOwner(function (socket, data, callback) {
acceptRejectAll(groups.acceptMembership, socket, data, callback); acceptRejectAll(groups.acceptMembership, socket, data, callback);
}); });
SocketGroups.rejectAll = isOwner(function(socket, data, callback) { SocketGroups.rejectAll = isOwner(function (socket, data, callback) {
acceptRejectAll(groups.rejectMembership, socket, data, callback); acceptRejectAll(groups.rejectMembership, socket, data, callback);
}); });
function acceptRejectAll(method, socket, data, callback) { function acceptRejectAll(method, socket, data, callback) {
async.waterfall([ async.waterfall([
function(next) { function (next) {
groups.getPending(data.groupName, next); groups.getPending(data.groupName, next);
}, },
function(uids, next) { function (uids, next) {
async.each(uids, function(uid, next) { async.each(uids, function (uid, next) {
method(data.groupName, uid, next); method(data.groupName, uid, next);
}, next); }, next);
} }
], callback); ], callback);
} }
SocketGroups.issueInvite = isOwner(function(socket, data, callback) { SocketGroups.issueInvite = isOwner(function (socket, data, callback) {
groups.invite(data.groupName, data.toUid, callback); groups.invite(data.groupName, data.toUid, callback);
}); });
SocketGroups.rescindInvite = isOwner(function(socket, data, callback) { SocketGroups.rescindInvite = isOwner(function (socket, data, callback) {
groups.rejectMembership(data.groupName, data.toUid, callback); groups.rejectMembership(data.groupName, data.toUid, callback);
}); });
SocketGroups.acceptInvite = isInvited(function(socket, data, callback) { SocketGroups.acceptInvite = isInvited(function (socket, data, callback) {
groups.acceptMembership(data.groupName, socket.uid, callback); groups.acceptMembership(data.groupName, socket.uid, callback);
}); });
SocketGroups.rejectInvite = isInvited(function(socket, data, callback) { SocketGroups.rejectInvite = isInvited(function (socket, data, callback) {
groups.rejectMembership(data.groupName, socket.uid, callback); groups.rejectMembership(data.groupName, socket.uid, callback);
}); });
SocketGroups.update = isOwner(function(socket, data, callback) { SocketGroups.update = isOwner(function (socket, data, callback) {
groups.update(data.groupName, data.values, callback); groups.update(data.groupName, data.values, callback);
}); });
SocketGroups.kick = isOwner(function(socket, data, callback) { SocketGroups.kick = isOwner(function (socket, data, callback) {
if (socket.uid === parseInt(data.uid, 10)) { if (socket.uid === parseInt(data.uid, 10)) {
return callback(new Error('[[error:cant-kick-self]]')); return callback(new Error('[[error:cant-kick-self]]'));
} }
groups.ownership.isOwner(data.uid, data.groupName, function(err, isOwner) { groups.ownership.isOwner(data.uid, data.groupName, function (err, isOwner) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -165,7 +166,7 @@ SocketGroups.kick = isOwner(function(socket, data, callback) {
}); });
SocketGroups.create = function(socket, data, callback) { SocketGroups.create = function (socket, data, callback) {
if (!socket.uid) { if (!socket.uid) {
return callback(new Error('[[error:no-privileges]]')); return callback(new Error('[[error:no-privileges]]'));
} else if (parseInt(meta.config.allowGroupCreation, 10) !== 1) { } else if (parseInt(meta.config.allowGroupCreation, 10) !== 1) {
@ -179,7 +180,7 @@ SocketGroups.create = function(socket, data, callback) {
groups.create(data, callback); groups.create(data, callback);
}; };
SocketGroups.delete = function(socket, data, callback) { SocketGroups.delete = function (socket, data, callback) {
if (data.groupName === 'administrators' || if (data.groupName === 'administrators' ||
data.groupName === 'registered-users' || data.groupName === 'registered-users' ||
data.groupName === 'Global Moderators') { data.groupName === 'Global Moderators') {
@ -189,7 +190,7 @@ SocketGroups.delete = function(socket, data, callback) {
async.parallel({ async.parallel({
isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName), isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName),
isAdmin: async.apply(user.isAdministrator, socket.uid) isAdmin: async.apply(user.isAdministrator, socket.uid)
}, function(err, checks) { }, function (err, checks) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -201,12 +202,12 @@ SocketGroups.delete = function(socket, data, callback) {
}); });
}; };
SocketGroups.search = function(socket, data, callback) { SocketGroups.search = function (socket, data, callback) {
data.options = data.options || {}; data.options = data.options || {};
if (!data.query) { if (!data.query) {
var groupsPerPage = 15; var groupsPerPage = 15;
groupsController.getGroupsFromSet(socket.uid, data.options.sort, 0, groupsPerPage - 1, function(err, data) { groupsController.getGroupsFromSet(socket.uid, data.options.sort, 0, groupsPerPage - 1, function (err, data) {
callback(err, !err ? data.groups : null); callback(err, !err ? data.groups : null);
}); });
return; return;
@ -215,7 +216,7 @@ SocketGroups.search = function(socket, data, callback) {
groups.search(data.query, data.options || {}, callback); groups.search(data.query, data.options || {}, callback);
}; };
SocketGroups.loadMore = function(socket, data, callback) { SocketGroups.loadMore = function (socket, data, callback) {
if (!data.sort || !data.after) { if (!data.sort || !data.after) {
return callback(); return callback();
} }
@ -226,33 +227,36 @@ SocketGroups.loadMore = function(socket, data, callback) {
groupsController.getGroupsFromSet(socket.uid, data.sort, start, stop, callback); groupsController.getGroupsFromSet(socket.uid, data.sort, start, stop, callback);
}; };
SocketGroups.searchMembers = function(socket, data, callback) { SocketGroups.searchMembers = function (socket, data, callback) {
data.uid = socket.uid; data.uid = socket.uid;
groups.searchMembers(data, callback); groups.searchMembers(data, callback);
}; };
SocketGroups.loadMoreMembers = function(socket, data, callback) { SocketGroups.loadMoreMembers = function (socket, data, callback) {
if (!data.groupName || !parseInt(data.after, 10)) { if (!data.groupName || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
data.after = parseInt(data.after, 10); data.after = parseInt(data.after, 10);
user.getUsersFromSet('group:' + data.groupName + ':members', socket.uid, data.after, data.after + 9, function(err, users) { user.getUsersFromSet('group:' + data.groupName + ':members', socket.uid, data.after, data.after + 9, function (err, users) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
callback(null, {users: users, nextStart: data.after + 10}); callback(null, {
users: users,
nextStart: data.after + 10
});
}); });
}; };
SocketGroups.cover = {}; SocketGroups.cover = {};
SocketGroups.cover.update = function(socket, data, callback) { SocketGroups.cover.update = function (socket, data, callback) {
if (!socket.uid) { if (!socket.uid) {
return callback(new Error('[[error:no-privileges]]')); return callback(new Error('[[error:no-privileges]]'));
} }
groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { groups.ownership.isOwner(socket.uid, data.groupName, function (err, isOwner) {
if (err || !isOwner) { if (err || !isOwner) {
return callback(err || new Error('[[error:no-privileges]]')); return callback(err || new Error('[[error:no-privileges]]'));
} }
@ -261,12 +265,12 @@ SocketGroups.cover.update = function(socket, data, callback) {
}); });
}; };
SocketGroups.cover.remove = function(socket, data, callback) { SocketGroups.cover.remove = function (socket, data, callback) {
if (!socket.uid) { if (!socket.uid) {
return callback(new Error('[[error:no-privileges]]')); return callback(new Error('[[error:no-privileges]]'));
} }
groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { groups.ownership.isOwner(socket.uid, data.groupName, function (err, isOwner) {
if (err || !isOwner) { if (err || !isOwner) {
return callback(err || new Error('[[error:no-privileges]]')); return callback(err || new Error('[[error:no-privileges]]'));
} }

Write Preview
Loading…
Cancel
Save