closes #3583

src/groups/create.js

@@ -13,57 +13,62 @@ module.exports = function(Groups) {
 		}
 
 		var system = data.name === 'administrators' || data.name === 'registered-users' || Groups.isPrivilegeGroup(data.name);
+		var groupData;
+		var timestamp = data.timestamp || Date.now();
 
-		meta.userOrGroupExists(data.name, function (err, exists) {
+		async.waterfall([
-			if (err) {
+			function (next) {
-				return callback(err);
+				meta.userOrGroupExists(data.name, next);
-			}
+			},
+			function (exists, next) {
+				if (exists) {
+					return next(new Error('[[error:group-already-exists]]'));
+				}
 
-			if (exists) {
+				var memberCount = data.hasOwnProperty('ownerUid') ? 1 : 0;
-				return callback(new Error('[[error:group-already-exists]]'));
+				var slug = utils.slugify(data.name);
-			}
+				groupData = {
-			var timestamp = data.timestamp || Date.now();
+					name: data.name,
-			var memberCount = data.hasOwnProperty('ownerUid') ? 1 : 0;
+					slug: slug,
-			var slug = utils.slugify(data.name);
+					createtime: timestamp,
-			var groupData = {
+					userTitle: data.name,
-				name: data.name,
+					description: data.description || '',
-				slug: slug,
+					memberCount: memberCount,
-				createtime: timestamp,
+					deleted: '0',
-				userTitle: data.name,
+					hidden: data.hidden || '0',
-				description: data.description || '',
+					system: system ? '1' : '0',
-				memberCount: memberCount,
+					private: data.private || '1'
-				deleted: '0',
+				};
-				hidden: data.hidden || '0',
+				plugins.fireHook('filter:group.create', {group: groupData, data: data}, next);
-				system: system ? '1' : '0',
+			},
-				private: data.private || '1'
+			function (results, next) {
-			};
+				var tasks = [
-			var tasks = [
+					async.apply(db.sortedSetAdd, 'groups:createtime', groupData.createtime, groupData.name),
-				async.apply(db.sortedSetAdd, 'groups:createtime', timestamp, data.name),
+					async.apply(db.setObject, 'group:' + groupData.name, groupData)
-				async.apply(db.setObject, 'group:' + data.name, groupData)
+				];
-			];
 
-			if (data.hasOwnProperty('ownerUid')) {
+				if (data.hasOwnProperty('ownerUid')) {
-				tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':owners', data.ownerUid));
+					tasks.push(async.apply(db.setAdd, 'group:' + groupData.name + ':owners', data.ownerUid));
-				tasks.push(async.apply(db.sortedSetAdd, 'group:' + data.name + ':members', timestamp, data.ownerUid));
+					tasks.push(async.apply(db.sortedSetAdd, 'group:' + groupData.name + ':members', timestamp, data.ownerUid));
 
-				groupData.ownerUid = data.ownerUid;
+					groupData.ownerUid = data.ownerUid;
-			}
+				}
 
-			if (!data.hidden && !system) {
+				if (!data.hidden && !system) {
-				tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:createtime', timestamp, data.name));
+					tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:createtime', timestamp, groupData.name));
-				tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:memberCount', memberCount, data.name));
+					tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:memberCount', groupData.memberCount, groupData.name));
-				tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:name', 0, data.name.toLowerCase() + ':' + data.name));
+					tasks.push(async.apply(db.sortedSetAdd, 'groups:visible:name', 0, groupData.name.toLowerCase() + ':' + groupData.name));
-			}
+				}
 
-			tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', slug, data.name));
+				tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', groupData.slug, groupData.name));
 
-			async.series(tasks, function(err) {
+				async.series(tasks, next);
-				if (!err) {
+			},
-					plugins.fireHook('action:group.create', groupData);
+			function (results, next) {
-				}
+				plugins.fireHook('action:group.create', groupData);
+				next(null, groupData);
+			}
+		], callback);
 
-				callback(err, groupData);
-			});
-		});
 	};
 };