Merge remote-tracking branch 'origin/master' into category-whitelisting

Conflicts:
	src/groups.js

public/templates/topic.tpl

@@ -76,6 +76,9 @@
 
 								<div class="btn-group pull-right post-tools">
 									<button class="btn btn-sm btn-default link" type="button" title="[[topic:link]]"><i class="fa fa-link"></i></button>
+									<button class="btn btn-sm btn-default main-post facebook-share" type="button" title=""><i class="fa fa-facebook"></i></button>
+									<button class="btn btn-sm btn-default main-post twitter-share" type="button" title=""><i class="fa fa-twitter"></i></button>
+									<button class="btn btn-sm btn-default main-post google-share" type="button" title=""><i class="fa fa-google-plus"></i></button>
 									<button class="btn btn-sm btn-default edit {posts.display_moderator_tools}" type="button" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button>
 									<button class="btn btn-sm btn-default delete {posts.display_moderator_tools}" type="button" title="[[topic:delete]]"><i class="fa fa-trash-o"></i></button>
 								</div>

src/groups.js

@@ -1,11 +1,11 @@
-(function () {
+(function(Groups) {
 	"use strict";
 
 	var async = require('async'),
 		User = require('./user'),
-		RDB = RDB || require('./redis'),
+		RDB = RDB || require('./redis');
-		Groups = {
+
-			list: function (options, callback) {
+	Groups.list = function(options, callback) {
 		RDB.hvals('group:gid', function (err, gids) {
 			if (gids.length > 0) {
 				async.map(gids, function (gid, next) {
@@ -25,8 +25,9 @@
 				callback(null, []);
 			}
 		});
-			},
+	};
-			get: function (gid, options, callback) {
+
+	Groups.get = function(gid, options, callback) {
 		async.parallel({
 			base: function (next) {
 				RDB.hgetall('gid:' + gid, next);
@@ -60,26 +61,31 @@
 
 			callback(err, results.base);
 		});
-			},
+	};
-			getGidFromName: function (name, callback) {
+
+	Groups.getGidFromName = function(name, callback) {
 		RDB.hget('group:gid', name, callback);
-			},
+	};
-			isMember: function (uid, gid, callback) {
+
+	Groups.isMember = function(uid, gid, callback) {
 		RDB.sismember('gid:' + gid + ':members', uid, callback);
-			},
+	};
-			isMemberByGroupName: function(uid, groupName, callback) {
+
-				this.getGidFromName(groupName, function(err, gid) {
+	Groups.isMemberByGroupName = function(uid, groupName, callback)
+		this.getGidFromName(groupName, function(err, gid
 			if (err || !gid) {
 				callback(null, false);
 			} else {
-						Groups.isMember(uid, gid, callback);
+				Groups.isMember(uid, gid, callba
 			}
 		});
-			},
+	};
-			exists: function (name, callback) {
+
+	Groups.exists = function(name, callback) {
 		RDB.hexists('group:gid', name, callback);
-			},
+	};
-			create: function (name, description, callback) {
+
+	Groups.create = function(name, description, callback) {
 		if (name.length === 0) {
 			return callback(new Error('name-too-short'));
 		}
@@ -103,8 +109,9 @@
 				callback(new Error('group-exists'));
 			}
 		});
-			},
+	};
-			update: function (gid, values, callback) {
+
+	Groups.update = function(gid, values, callback) {
 		RDB.exists('gid:' + gid, function (err, exists) {
 			if (!err && exists) {
 				RDB.hmset('gid:' + gid, values, callback);
@@ -112,19 +119,20 @@
 				callback(new Error('gid-not-found'));
 			}
 		});
-			},
+	};
-			destroy: function (gid, callback) {
+
+	Groups.destroy = function(gid, callback) {
 		if (gid !== 1) {
 			RDB.hset('gid:' + gid, 'deleted', '1', callback);
 		}
-			},
+	};
-			join: function (gid, uid, callback) {
+
+	Groups.join = function(gid, uid, callback) {
 		RDB.sadd('gid:' + gid + ':members', uid, callback);
-			},
+	};
-			leave: function (gid, uid, callback) {
+
+	Groups.leave = function(gid, uid, callback) {
 		RDB.srem('gid:' + gid + ':members', uid, callback);
-			}
 	};
 	
-	module.exports = Groups;
+}(module.exports));
-}());