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

src/postTools.js

@@ -41,7 +41,8 @@ var	RDB = require('./redis.js'),
 		}
 
 		function hasEnoughRep(next) {
-			user.getUserField(uid, 'reputation', function(reputation) {
+			user.getUserField(uid, 'reputation', function(err, reputation) {
+				if (err) return next(null, false);
 				next(null, reputation >= meta.config['privileges:manage_content']);
 			});
 		}

src/posts.js

@@ -102,8 +102,7 @@ var	RDB = require('./redis.js'),
 	Posts.getPostData = function(pid, callback) {
 		RDB.hgetall('post:' + pid, function(err, data) {
 			if(err === null) {
-				plugins.fireHook('filter:post.get', data.content, function(content) {
-					data.content = content;
+				plugins.fireHook('filter:post.get', data, function(data) {
 					callback(data);
 				});
 			}
@@ -324,8 +323,8 @@ var	RDB = require('./redis.js'),
 								});
 							},
 							content: function(next) {
-								plugins.fireHook('filter:post.get', content, function(content) {
-									next(null, content);
+								plugins.fireHook('filter:post.get', postData, function(postData) {
+									next(null, postData.content);
 								});
 							}
 						}, function(err, results) {
@@ -335,7 +334,7 @@ var	RDB = require('./redis.js'),
 							callback(postData);
 						});
 
-						plugins.fireHook('action:post.save', [pid, content]);
+						plugins.fireHook('action:post.save', [postData]);
 
 						postSearch.index(content, pid);
 					});

src/routes/user.js

@@ -79,8 +79,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 
-			user.getUserField(req.user.uid, 'userslug', function(userslug) {
-
+			user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
 				if(req.params.userslug && userslug === req.params.userslug) {
 					app.build_header({ req: req, res: res }, function(err, header) {
 						res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']);
@@ -96,7 +95,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 
-			user.getUserField(req.user.uid, 'userslug', function(userslug) {
+			user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
 				if(req.params.userslug && userslug === req.params.userslug) {
 					app.build_header({ req: req, res: res }, function(err, header) {
 						res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']);
@@ -127,7 +126,7 @@ var user = require('./../user.js'),
 				return;
 			}
 
-			user.getUserField(req.user.uid, 'uploadedpicture', function(oldpicture) {
+			user.getUserField(req.user.uid, 'uploadedpicture', function(err, oldpicture) {
 				if(!oldpicture) {
 					uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res);
 					return;

src/threadTools.js

@@ -31,7 +31,8 @@ var	RDB = require('./redis.js'),
 		}
 
 		function hasEnoughRep(next) {
-			user.getUserField(uid, 'reputation', function(reputation) {
+			user.getUserField(uid, 'reputation', function(err, reputation) {
+				if (err) return next(null, false);
 				next(null, reputation >= meta.config['privileges:manage_topic']);
 			});
 		}

src/topics.js

@@ -33,8 +33,7 @@ marked.setOptions({
 
 	Topics.getTopicDataWithUsername = function(tid, callback) {
 		Topics.getTopicData(tid, function(topic) {
-			user.getUserField(topic.uid, 'username', function(username) {
-
+			user.getUserField(topic.uid, 'username', function(err, username) {
 				topic.username = username;
 				callback(topic);
 			});
@@ -572,8 +571,8 @@ marked.setOptions({
 			return;
 		}
 
-		user.getUserField(uid, 'lastposttime', function(lastposttime) {
-
+		user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
+			if (err) lastposttime = 0;
 			if(Date.now() - lastposttime < meta.config.postDelay) {
 				callback(new Error('too-many-posts'), null);
 				return;

src/user.js

@@ -139,13 +139,7 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.getUserField = function(uid, field, callback) {
-		RDB.hget('user:' + uid, field, function(err, data) {
-			if(err === null) {
-				callback(data);
-			} else {
-				console.log(err);
-			}
-		});
+		RDB.hget('user:' + uid, field, callback);
 	}
 
 	User.getUserFields = function(uid, fields, callback) {

src/webserver.js

@@ -161,7 +161,7 @@ var express = require('express'),
 					app.get('/' + route, function(req, res) {
 						if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
 
-							user.getUserField(req.user.uid, 'userslug', function(userslug) {
+							user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
 								res.redirect('/users/'+userslug);
 							});
 							return;

src/websockets.js

@@ -54,7 +54,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 					socket.join('uid_' + uid);
 					io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
 
-					user.getUserField(uid, 'username', function(username) {
+					user.getUserField(uid, 'username', function(err, username) {
 						socket.emit('event:connect', {status: 1, username:username});
 					});
 				}
@@ -275,12 +275,12 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			}
 
 			if(type === 'gravatar') {
-				user.getUserField(uid, 'gravatarpicture', function(gravatar) {
+				user.getUserField(uid, 'gravatarpicture', function(err, gravatar) {
 					user.setUserField(uid, 'picture', gravatar);
 					updateHeader();
 				});
 			} else if(type === 'uploaded') {
-				user.getUserField(uid, 'uploadedpicture', function(uploadedpicture) {
+				user.getUserField(uid, 'uploadedpicture', function(err, uploadedpicture) {
 					user.setUserField(uid, 'picture', uploadedpicture);
 					updateHeader();
 				});
@@ -514,7 +514,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				var msg = utils.strip_tags(data.message),
 					numSockets = userSockets[touid].length;
 
-				user.getUserField(uid, 'username', function(username) {
+				user.getUserField(uid, 'username', function(err, username) {
 					var finalMessage = username + ' says : ' + msg;
 
 					for(var x=0;x<numSockets;x++) {