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

some more group tests

Browse Source
This commit is contained in:
barisusakli
2016-11-22 17:21:30 +03:00
parent 4d86262812
commit cecb4c0403
3 changed files with 189 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
"use strict";
var async = require('async'),
var async = require('async');
groups = require('../groups'),
meta = require('../meta'),
user = require('../user'),
utils = require('../../public/src/utils'),
groupsController = require('../controllers/groups'),
var groups = require('../groups');
var meta = require('../meta');
var user = require('../user');
var utils = require('../../public/src/utils');
var groupsController = require('../controllers/groups');
SocketGroups = {};
var SocketGroups = {};
SocketGroups.before = function (socket, method, data, next) {
@@ -27,34 +27,36 @@ SocketGroups.join = function (socket, data, callback) {
return callback(new Error('[[error:not-allowed]]'));
}
groups.exists(data.groupName, function (err, exists) {
if (err || !exists) {
return callback(err || new Error('[[error:no-group]]'));
}
if (parseInt(meta.config.allowPrivateGroups, 10) !== 1) {
return groups.join(data.groupName, socket.uid, callback);
}
async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid),
groupData: async.apply(groups.getGroupData, data.groupName)
}, function (err, results) {
if (err) {
return callback(err);
async.waterfall([
function (next) {
groups.exists(data.groupName, next);
},
function (exists, next) {
if (!exists) {
return next(new Error('[[error:no-group]]'));
}
if (parseInt(meta.config.allowPrivateGroups, 10) !== 1) {
return groups.join(data.groupName, socket.uid, callback);
}
async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid),
groupData: async.apply(groups.getGroupData, data.groupName)
}, next);
},
function (results, next) {
if (results.groupData.private && results.groupData.disableJoinRequests) {
return callback(new Error('[[error:join-requests-disabled]]'));
return next(new Error('[[error:join-requests-disabled]]'));
}
if (!results.groupData.private || results.isAdmin) {
groups.join(data.groupName, socket.uid, callback);
groups.join(data.groupName, socket.uid, next);
} else {
groups.requestMembership(data.groupName, socket.uid, callback);
groups.requestMembership(data.groupName, socket.uid, next);
}
});
});
}
], callback);
};
SocketGroups.leave = function (socket, data, callback) {