Merge branch 'master' of github.com:designcreateplay/NodeBB

src/database/mongo.js

@@ -343,6 +343,20 @@
 		});
 	}
 
+	module.getObjectKeys = function(key, callback) {
+		module.getObject(key, function(err, data) {
+			if(err) {
+				return callback(err);
+			}
+
+			if(data) {
+				callback(null, Object.keys(data));
+			} else {
+				callback(null, []);
+			}
+		});
+	}
+
 	module.getObjectValues = function(key, callback) {
 		module.getObject(key, function(err, data) {
 			if(err) {

src/database/redis.js

@@ -275,6 +275,10 @@
 		});
 	}
 
+	module.getObjectKeys = function(key, callback) {
+		redisClient.hkeys(key, callback);
+	}
+
 	module.getObjectValues = function(key, callback) {
 		redisClient.hvals(key, callback);
 	}

src/install.js

@@ -26,12 +26,6 @@ var async = require('async'),
 			'default': (nconf.get('use_port') !== undefined ? (nconf.get('use_port') ? 'y' : 'n') : 'y'),
 			pattern: /y[es]*|n[o]?/,
 			message: 'Please enter \'yes\' or \'no\''
-		}, {
-			name: 'use_proxy',
-			description: 'is NodeBB behind a proxy?',
-			'default': (nconf.get('use_proxy') !== undefined ? (nconf.get('use_proxy') ? 'y' : 'n') : 'y'),
-			pattern: /y[es]*|n[o]?/,
-			message: 'Please enter \'yes\' or \'no\''
 		}, {
 			name: 'secret',
 			description: 'Please enter a NodeBB secret',
@@ -147,7 +141,6 @@ var async = require('async'),
 							config.bcrypt_rounds = 12;
 							config.upload_path = '/public/uploads';
 							config.use_port = config.use_port.slice(0, 1) === 'y';
-							config.use_proxy = config.use_proxy.slice(0, 1) === 'y';
 
 							var urlObject = url.parse(config.base_url),
 								relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '',

src/posts.js

@@ -439,26 +439,23 @@ var db = require('./database'),
 
 	Posts.reIndexPids = function(pids, callback) {
 
-		function reIndex(pid, callback) {
+		function reIndex(pid, next) {
 
 			Posts.getPostField(pid, 'content', function(err, content) {
-				db.searchRemove('post', pid, function() {
+				if(err) {
+					return next(err);
+				}
 
+				db.searchRemove('post', pid, function() {
 					if (content && content.length) {
 						db.searchIndex('post', content, pid);
 					}
-					callback(null);
+					next();
 				});
 			});
 		}
 
-		async.each(pids, reIndex, function(err) {
-			if (err) {
-				callback(err, null);
-			} else {
-				callback(null, 'Posts reindexed');
-			}
-		});
+		async.each(pids, reIndex, callback);
 	}
 
 	Posts.getFavourites = function(uid, callback) {

src/socket.io/admin.js

@@ -91,7 +91,7 @@ SocketAdmin.user.search = function(socket, username, callback) {
 			});
 		}
 
-		async.each(data, isAdmin, function(err) {
+		async.each(data.users, isAdmin, function(err) {
 			callback(err, data);
 		});
 	});
@@ -126,7 +126,7 @@ SocketAdmin.categories.search = function(socket, data, callback) {
 		cid = data.cid;
 
 	user.search(username, function(err, data) {
-		async.map(data, function(userObj, next) {
+		async.map(data.users, function(userObj, next) {
 			CategoryTools.privileges(cid, userObj.uid, function(err, privileges) {
 				if(err) {
 					return next(err);

src/topics.js

@@ -53,7 +53,6 @@ var async = require('async'),
 
 				user.addTopicIdToUser(uid, tid, timestamp);
 
-				// in future it may be possible to add topics to several categories, so leaving the door open here.
 				db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid);
 				db.incrObjectField('category:' + cid, 'topic_count');
 				db.incrObjectField('global', 'topicCount');
@@ -66,75 +65,65 @@ var async = require('async'),
 	};
 
 	Topics.post = function(uid, title, content, cid, callback) {
+		if (title) {
+			title = title.trim();
+		}
 
-		categoryTools.privileges(cid, uid, function(err, privileges) {
+		if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
+			return callback(new Error('title-too-short'));
+		} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
+			return callback(new Error('title-too-long'));
+		}
 
-			if(err) {
-				return callback(err);
-			} else if(!privileges.write) {
-				return callback(new Error('no-privileges'));
-			} else if (!cid) {
-				return callback(new Error('invalid-cid'));
-			}
+		if (content) {
+			content = content.trim();
+		}
 
-			if (title) {
-				title = title.trim();
-			}
+		if (!content || content.length < meta.config.miminumPostLength) {
+			return callback(new Error('content-too-short'));
+		}
 
-			if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
-				return callback(new Error('title-too-short'), null);
-			} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
-				return callback(new Error('title-too-long'), null);
-			}
+		if (!cid) {
+			return callback(new Error('invalid-cid'));
+		}
 
-			if (content) {
-				content = content.trim();
-			}
-
-			if (!content || content.length < meta.config.miminumPostLength) {
-				return callback(new Error('content-too-short'), null);
-			}
-
-			user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
-				if (err) {
-					return callback(err);
+		async.waterfall([
+			function(next) {
+				categoryTools.privileges(cid, uid, next);
+			},
+			function(privileges, next) {
+				if(!privileges.write) {
+					return next(new Error('no-privileges'));
 				}
-
-				if(!lastposttime) {
-					lastposttime = 0;
-				}
-
-				if (Date.now() - lastposttime < meta.config.postDelay * 1000) {
-					return callback(new Error('too-many-posts'), null);
-				}
-
-				Topics.create(uid, title, cid, function(err, tid) {
+				next();
+			},
+			function(next) {
+				user.isReadyToPost(uid, next);
+			},
+			function(next) {
+				Topics.create(uid, title, cid, next);
+			},
+			function(tid, next) {
+				Topics.reply(tid, uid, content, next);
+			},
+			function(postData, next) {
+				threadTools.toggleFollow(postData.tid, uid);
+				next(null, postData);
+			},
+			function(postData, next) {
+				Topics.getTopicForCategoryView(postData.tid, uid, function(err, topicData) {
 					if(err) {
-						return callback(err);
+						return next(err);
 					}
 
-					Topics.reply(tid, uid, content, function(err, postData) {
-
-						if(err) {
-							return callback(err, null);
-						} else if(!postData) {
-							return callback(new Error('invalid-post'), null);
-						}
-
-						threadTools.toggleFollow(tid, uid);
-
-						Topics.getTopicForCategoryView(tid, uid, function(topicData) {
-							topicData.unreplied = 1;
-
-							callback(null, {
-								topicData: topicData,
-								postData: postData
-							});
-						});
+					topicData.unreplied = 1;
+					next(null, {
+						topicData: topicData,
+						postData: postData
 					});
 				});
-			});
-		});
+			}
+		], callback);
 	};
 
 	Topics.reply = function(tid, uid, content, callback) {
@@ -152,18 +141,7 @@ var async = require('async'),
 				next();
 			},
 			function(next) {
-				user.getUserField(uid, 'lastposttime', next);
-			},
-			function(lastposttime, next) {
-				if(!lastposttime) {
-					lastposttime = 0;
-				}
-
-				if (Date.now() - parseInt(lastposttime, 10) < parseInt(meta.config.postDelay, 10) * 1000) {
-					return next(new Error('too-many-posts'), null);
-				}
-
-				next();
+				user.isReadyToPost(uid, next);
 			},
 			function(next) {
 				if (content) {
@@ -235,41 +213,40 @@ var async = require('async'),
 		pids.sort();
 		var mainPid = pids[0];
 
-		posts.getPostData(mainPid, function(err, postData) {
-			if(err) {
-				return callback(err);
+		async.parallel({
+			postData: function(callback) {
+				posts.getPostData(mainPid, callback);
+			},
+			cid: function(callback) {
+				posts.getCidByPid(mainPid, callback);
 			}
-
-			posts.getCidByPid(mainPid, function(err, cid) {
+		}, function(err, results) {
+			Topics.create(results.postData.uid, title, results.cid, function(err, tid) {
 				if(err) {
 					return callback(err);
 				}
 
-				Topics.create(postData.uid, title, cid, function(err, tid) {
+				async.eachSeries(pids, move, function(err) {
 					if(err) {
 						return callback(err);
 					}
 
-					async.eachSeries(pids, move, function(err) {
+					Topics.getTopicData(tid, callback);
+				});
+
+				function move(pid, next) {
+					postTools.privileges(pid, uid, function(err, privileges) {
 						if(err) {
-							return callback(err);
+							return next(err);
 						}
 
-						Topics.getTopicData(tid, function(err, topicData) {
-							callback(err, topicData);
-						});
+						if(privileges.editable) {
+							Topics.movePostToTopic(pid, tid, next);
+						} else {
+							next();
+						}
 					});
-
-					function move(pid, next) {
-						postTools.privileges(pid, uid, function(err, privileges) {
-							if(privileges.editable) {
-								Topics.movePostToTopic(pid, tid, next);
-							} else {
-								next();
-							}
-						});
-					}
-				});
+				}
 			});
 		});
 	}
@@ -418,6 +395,10 @@ var async = require('async'),
 
 	Topics.getCategoryData = function(tid, callback) {
 		Topics.getTopicField(tid, 'cid', function(err, cid) {
+			if(err) {
+				callback(err);
+			}
+
 			categories.getCategoryData(cid, callback);
 		});
 	}
@@ -838,15 +819,12 @@ var async = require('async'),
 		}
 
 		function getTeaser(next) {
-			Topics.getTeaser(tid, function(err, teaser) {
-				if (err) teaser = {};
-				next(null, teaser);
-			});
+			Topics.getTeaser(tid, next);
 		}
 
 		async.parallel([getTopicData, getReadStatus, getTeaser], function(err, results) {
 			if (err) {
-				throw new Error(err);
+				return callback(err);
 			}
 
 			var topicData = results[0],
@@ -863,7 +841,7 @@ var async = require('async'),
 			topicData.teaser_timestamp = utils.toISOString(teaser.timestamp);
 			topicData.teaser_userpicture = teaser.picture;
 
-			callback(topicData);
+			callback(null, topicData);
 		});
 	}
 
@@ -1151,33 +1129,20 @@ var async = require('async'),
 	Topics.reIndexTopic = function(tid, callback) {
 		Topics.getPids(tid, function(err, pids) {
 			if (err) {
-				callback(err);
-			} else {
-				posts.reIndexPids(pids, function(err) {
-					if (err) {
-						callback(err);
-					} else {
-						callback(null);
-					}
-				});
+				return callback(err);
 			}
+
+			posts.reIndexPids(pids, callback);
 		});
 	}
 
 	Topics.reIndexAll = function(callback) {
 		db.getSetMembers('topics:tid', function(err, tids) {
 			if (err) {
-				callback(err, null);
-			} else {
-
-				async.each(tids, Topics.reIndexTopic, function(err) {
-					if (err) {
-						callback(err, null);
-					} else {
-						callback(null, 'All topics reindexed.');
-					}
-				});
+				return callback(err);
 			}
+
+			async.each(tids, Topics.reIndexTopic, callback);
 		});
 	}
 

src/user.js

@@ -348,6 +348,23 @@ var bcrypt = require('bcrypt'),
 		}
 	};
 
+	User.isReadyToPost = function(uid, callback) {
+		User.getUserField(uid, 'lastposttime', function(err, lastposttime) {
+			if(err) {
+				return callback(err);
+			}
+
+			if(!lastposttime) {
+				lastposttime = 0;
+			}
+
+			if (Date.now() - parseInt(lastposttime, 10) < parseInt(meta.config.postDelay, 10) * 1000) {
+				return callback(new Error('too-many-posts'));
+			}
+			callback();
+		});
+	}
+
 	User.isEmailAvailable = function(email, callback) {
 		db.isObjectField('email:uid', email, function(err, exists) {
 			callback(err, !exists);
@@ -473,34 +490,36 @@ var bcrypt = require('bcrypt'),
 
 	User.search = function(query, callback) {
 		if (!query || query.length === 0) {
-			return callback(null, []);
+			return callback(null, {timing:0, users:[]});
 		}
+		var start = process.hrtime();
 
-		// TODO: Have this use db.getObjectKeys (doesn't exist yet)
 		db.getObject('username:uid', function(err, usernamesHash) {
 			if (err) {
-				return callback(null, []);
+				return callback(null, {timing: 0, users:[]});
 			}
 
+			query = query.toLowerCase();
+
 			var	usernames = Object.keys(usernamesHash),
 				results = [];
 
-			results = usernames.filter(function(username) {		// Remove non-matches
-				return username.indexOf(query) === 0;
-			}).sort(function(a, b) {							// Sort alphabetically
+			results = usernames.filter(function(username) {
+				return username.toLowerCase().indexOf(query) === 0;
+			})
+			.slice(0, 10)
+			.sort(function(a, b) {
 				return a > b;
-			}).slice(0, 5)										// Limit 5
-			.map(function(username) {							// Translate to uids
+			})
+			.map(function(username) {
 				return usernamesHash[username];
 			});
 
-			if (results && results.length) {
-				User.getDataForUsers(results, function(userdata) {
-					callback(null, userdata);
-				});
-			} else {
-				callback(null, []);
-			}
+			User.getDataForUsers(results, function(userdata) {
+				var diff = process.hrtime(start);
+				var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1);
+				callback(null, {timing: timing, users: userdata});
+			});
 		});
 	};
 

src/webserver.js

@@ -191,23 +191,11 @@ if(nconf.get('ssl')) {
 
 				app.use(express.csrf());
 
-				// negative boolean with type check here to support a config.json without a 'use_proxy' value, 
-				// so unless it's specifically set to false, it's true (as long as it's not a dev env)
-				// todo: remove double negative with a minor release, where backward compatibility can be broken
-				// and if dev mode, then it's probably not behind a proxy but it can be forced by setting 'use_proxy' to true
-
-				if (nconf.get('use_proxy') === false) {
-					winston.info('\'use_proxy\' is set to false in config file, skipping \'trust proxy\'');
-
-				} else if (!nconf.get('use_proxy') && process.env.NODE_ENV === 'development') {
-					winston.info('\'use_proxy\' is not set, skipping because you\'re in development env. Set to true to force enabling it.');
-
-				} else {
-					winston.info('\'use_proxy\''
-						+ (nconf.get('use_proxy') === true ? ' is set to true ' : ' is not set ')
-						+ 'in config file, enabling \'trust proxy\', set to false to disable it.');
-
+				if (nconf.get('port') != 80 && nconf.get('port') != 443 && nconf.get('use_port') === true) {
+					winston.info('Enabling \'trust proxy\'');
 					app.enable('trust proxy');
+				} else if (process.env.NODE_ENV !== 'development') {
+					winston.info('Using ports 80 and 443 is not recommend; use a proxy instead. See README.md');
 				}
 
 				// Local vars, other assorted setup
@@ -401,7 +389,7 @@ if(nconf.get('ssl')) {
 			});
 		});
 
-		plugins.fireHook('action:app.load');
+		plugins.fireHook('action:app.load', app);
 
 		translator.translate(templates.logout.toString(), function(parsedTemplate) {
 			templates.logout = parsedTemplate;