group creation and deletion

src/groups.js

@@ -1,12 +1,19 @@
 var	async = require('async'),
 	User = require('./user'),
 	Groups = {
-		list: function(callback) {
+		list: function(options, callback) {
 			RDB.hvals('group:gid', function(err, gids) {
 				if (gids.length > 0) {
-					async.each(gids, function(gid, next) {
-						Groups.get(gid, next);
-					}, callback);
+					async.map(gids, function(gid, next) {
+						Groups.get(gid, {
+							expand: options.expand
+						}, next);
+					}, function(err, groups) {
+						callback(err, groups.filter(function(group) {
+							if (group.deleted === '1') return false;
+							else return true;
+						}));
+					});
 				} else callback(null, []);
 			});
 		},
@@ -33,10 +40,10 @@ var	async = require('async'),
 			}, function(err, results) {
 				if (err) return callback(err);
 
-				results[0].count = results[1].length;
-				results[0].users = results[1];
+				results.base.count = results.users.length;
+				results.base.members = results.users;
 
-				callback(err, results[0]);
+				callback(err, results.base);
 			});
 		},
 		getGidFromName: function(name, callback) {
@@ -49,26 +56,28 @@ var	async = require('async'),
 			RDB.hexists('group:gid', name, callback);
 		},
 		create: function(name, description, callback) {
+			if (name.length === 0) return callback(new Error('name-too-short'));
+
 			Groups.exists(name, function(err, exists) {
 				if (!exists) {
 					RDB.incr('next_gid', function(err, gid) {
 						RDB.multi()
 							.hset('group:gid', name, gid)
-							.hset('gid:' + gid, {
+							.hmset('gid:' + gid, {
 								gid: gid,
 								name: name,
 								description: description,
 								deleted: '0'
 							})
 						.exec(function(err) {
-							callback(err, gid);
+							Groups.get(gid, {}, callback);
 						});
 					});
-				}
+				} else callback(new Error('group-exists'))
 			});
 		},
 		destroy: function(gid, callback) {
-			RDB.hset('gid:' + gid, deleted, '1', callback);
+			RDB.hset('gid:' + gid, 'deleted', '1', callback);
 		},
 		join: function(gid, uid, callback) {
 			RDB.sadd('gid:' + gid + ':members', uid, callback);

src/routes/admin.js

@@ -1,5 +1,6 @@
 
 var user = require('./../user.js'),
+	Groups = require('../groups'),
 	topics = require('./../topics.js'),
 	RDB = require('./../redis.js'),
 	pkg = require('./../../package.json'),
@@ -27,7 +28,7 @@ var user = require('./../user.js'),
 		(function() {
 			var	routes = [
 					'categories/active', 'categories/disabled', 'users', 'topics', 'settings', 'themes',
-					'twitter', 'facebook', 'gplus', 'redis', 'motd', 
+					'twitter', 'facebook', 'gplus', 'redis', 'motd', 'groups',
 					'users/latest', 'users/sort-posts', 'users/sort-reputation',
 					'users/search', 'plugins'
 				];
@@ -189,6 +190,15 @@ var user = require('./../user.js'),
 			res.json(200, {});
 		});
 
+		app.get('/api/admin/groups', function(req, res) {
+			Groups.list({
+				expand: true
+			}, function(err, groups) {
+				res.json(200, {
+					groups: groups
+				});
+			});
+		});
 	};
 
 

src/websockets.js

@@ -3,6 +3,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 	cookie = require('cookie'),
 	express = require('express'),
 	user = require('./user.js'),
+	Groups = require('./groups'),
 	posts = require('./posts.js'),
 	favourites = require('./favourites.js'),
 	utils = require('../public/src/utils.js'),
@@ -817,6 +818,30 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				callback(title, numNotifications);
 			});
 		});
+
+		/*
+			GROUPS
+		*/
+
+		socket.on('api:groups.create', function(data, callback) {
+			Groups.create(data.name, data.description, function(err, groupObj) {
+				callback(err ? err.message : null, groupObj || undefined);
+			});
+		});
+
+		socket.on('api:groups.delete', function(gid, callback) {
+			Groups.destroy(gid, function(err) {
+				callback(err ? err.message : null, err ? null : 'OK');
+			});
+		});
+
+		socket.on('api:groups.get', function(gid, callback) {
+			Groups.get(gid, {
+				expand: true
+			}, function(err, groupObj) {
+				callback(err ? err.message : null, groupObj || undefined);
+			});
+		});
 	});
 
 }(SocketIO));