Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5618

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-05-27 23:58:12 -04:00
parent 08aaabd33c
commit 5e90e4db02
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/groups/membership.js
View File

@@ -148,7 +148,9 @@ module.exports = function (Groups) {
async.parallel([
async.apply(db.setRemove, 'group:' + groupName + ':pending', uid),
async.apply(db.setRemove, 'group:' + groupName + ':invited', uid),
], callback);
], function (err) {
callback(err);
});
};
Groups.invite = function (groupName, uid, callback) {

39
src/socket.io/groups.js
View File

@@ -7,6 +7,7 @@ var meta = require('../meta');
var user = require('../user');
var utils = require('../utils');
var groupsController = require('../controllers/groups');
var events = require('../events');
var SocketGroups = module.exports;
@@ -104,19 +105,47 @@ SocketGroups.rescind = isOwner(function (socket, data, callback) {
});
SocketGroups.accept = isOwner(function (socket, data, callback) {
groups.acceptMembership(data.groupName, data.toUid, callback);
async.waterfall([
function (next) {
groups.acceptMembership(data.groupName, data.toUid, next);
},
function (next) {
events.log({
type: 'accept-membership',
uid: socket.uid,
ip: socket.ip,
groupName: data.groupName,
targetUid: data.toUid,
});
setImmediate(next);
},
], callback);
});
SocketGroups.reject = isOwner(function (socket, data, callback) {
groups.rejectMembership(data.groupName, data.toUid, callback);
async.waterfall([
function (next) {
groups.rejectMembership(data.groupName, data.toUid, next);
},
function (next) {
events.log({
type: 'reject-membership',
uid: socket.uid,
ip: socket.ip,
groupName: data.groupName,
targetUid: data.toUid,
});
setImmediate(next);
},
], callback);
});
SocketGroups.acceptAll = isOwner(function (socket, data, callback) {
acceptRejectAll(groups.acceptMembership, socket, data, callback);
acceptRejectAll(SocketGroups.accept, socket, data, callback);
});
SocketGroups.rejectAll = isOwner(function (socket, data, callback) {
acceptRejectAll(groups.rejectMembership, socket, data, callback);
acceptRejectAll(SocketGroups.reject, socket, data, callback);
});
function acceptRejectAll(method, socket, data, callback) {
@@ -126,7 +155,7 @@ function acceptRejectAll(method, socket, data, callback) {
},
function (uids, next) {
async.each(uids, function (uid, next) {
method(data.groupName, uid, next);
method(socket, { groupName: data.groupName, toUid: uid }, next);
}, next);
},
], callback);