more fixes

public/src/app.js

@@ -253,7 +253,7 @@ var socket,
 			uids.push(this.getAttribute('data-uid'));
 		});
 
-		socket.emit('user.get_online_users', uids, function (users) {
+		socket.emit('user.getOnlineUsers', uids, function (err, users) {
 			jQuery('a.username-field').each(function () {
 				if (this.processed === true)
 					return;

public/src/forum/account.js

@@ -37,14 +37,14 @@ define(['forum/accountheader'], function(header) {
 			followBtn.on('click', function() {
 				socket.emit('user.follow', {
 					uid: theirid
-				}, function(success) {
+				}, function(err) {
-					if (success) {
+					if(err) {
-						followBtn.addClass('hide');
+						return app.alertError('There was an error following' + username + '!');
-						unfollowBtn.removeClass('hide');
-						app.alertSuccess('You are now following ' + username + '!');
-					} else {
-						app.alertError('There was an error following' + username + '!');
 					}
+
+					followBtn.addClass('hide');
+					unfollowBtn.removeClass('hide');
+					app.alertSuccess('You are now following ' + username + '!');
 				});
 				return false;
 			});
@@ -52,14 +52,14 @@ define(['forum/accountheader'], function(header) {
 			unfollowBtn.on('click', function() {
 				socket.emit('user.unfollow', {
 					uid: theirid
-				}, function(success) {
+				}, function(err) {
-					if (success) {
+					if(err) {
-						followBtn.removeClass('hide');
+						return app.alertError('There was an error unfollowing ' + username + '!');
-						unfollowBtn.addClass('hide');
-						app.alertSuccess('You are no longer following ' + username + '!');
-					} else {
-						app.alertError('There was an error unfollowing ' + username + '!');
 					}
+
+					followBtn.removeClass('hide');
+					unfollowBtn.addClass('hide');
+					app.alertSuccess('You are no longer following ' + username + '!');
 				});
 				return false;
 			});

public/src/forum/accountsettings.js

@@ -11,11 +11,10 @@ define(['forum/accountheader'], function(header) {
 			};
 
 			socket.emit('user.saveSettings', settings, function(err) {
-				if (!err) {
+				if (err) {
-					app.alertSuccess('Settings saved!');
+					return app.alertError('There was an error saving settings!');
-				} else {
-					app.alertError('There was an error saving settings!');
 				}
+				app.alertSuccess('Settings saved!');
 			});
 			return false;
 		});

public/src/forum/admin/footer.js

@@ -15,6 +15,15 @@ jQuery('document').ready(function() {
 	}, false);
 });
 
-socket.emit('admin.config.get', function(config) {
+socket.emit('admin.config.get', function(err, config) {
+	if(err) {
+		return app.alert({
+			alert_id: 'config_status',
+			timeout: 2500,
+			title: 'Error',
+			message: 'NodeBB encountered a problem getting config',
+			type: 'danger'
+		});
+	}
 	app.config = config;
 });

public/src/forum/admin/settings.js

@@ -73,17 +73,9 @@ define(['uploader'], function(uploader) {
 				socket.emit('admin.config.set', {
 					key: key,
 					value: value
-				}, function(data) {
+				}, function(err) {
-					if (data.status === 'ok') {
+					if(err) {
-						app.alert({
+						return app.alert({
-							alert_id: 'config_status',
-							timeout: 2500,
-							title: 'Changes Saved',
-							message: 'Your changes to the NodeBB configuration have been saved.',
-							type: 'success'
-						});
-					} else {
-						app.alert({
 							alert_id: 'config_status',
 							timeout: 2500,
 							title: 'Changes Not Saved',
@@ -91,6 +83,15 @@ define(['uploader'], function(uploader) {
 							type: 'danger'
 						});
 					}
+
+					app.alert({
+						alert_id: 'config_status',
+						timeout: 2500,
+						title: 'Changes Saved',
+						message: 'Your changes to the NodeBB configuration have been saved.',
+						type: 'success'
+					});
+
 				});
 			}
 		});

src/socket.io/admin.js

@@ -233,26 +233,22 @@ SocketAdmin.plugins.toggle = function(socket, plugin_id) {
 SocketAdmin.config = {};
 
 SocketAdmin.config.get = function(socket, data, callback) {
-	meta.configs.list(function(err, config) {
+	meta.configs.list(callback);
-		if (!err) {
-			callback(config);
-		}
-	});
 };
 
 SocketAdmin.config.set = function(socket, data, callback) {
 	meta.configs.set(data.key, data.value, function(err) {
-		if (!err) {
+		if(err) {
-			callback({
+			return callback(err);
-				status: 'ok'
-			});
-
-			plugins.fireHook('action:config.set', {
-				key: data.key,
-				value: data.value
-			});
 		}
 
+		callback(null);
+
+		plugins.fireHook('action:config.set', {
+			key: data.key,
+			value: data.value
+		});
+
 		logger.monitorConfig({io: index.server}, data);
 	});
 };

src/socket.io/user.js

@@ -97,13 +97,11 @@ SocketUser.saveSettings = function(socket, data, callback) {
 	if (socket.uid) {
 		user.setUserFields(socket.uid, {
 			showemail: data.showemail
-		}, function(err, result) {
+		}, callback);
-			callback(err);
-		});
 	}
 };
 
-SocketUser.get_online_users = function(socket, data, callback) {
+SocketUser.getOnlineUsers = function(socket, data, callback) {
 	var returnData = [];
 
 	for (var i = 0; i < data.length; ++i) {
@@ -115,7 +113,7 @@ SocketUser.get_online_users = function(socket, data, callback) {
 		}
 	}
 
-	callback(returnData);
+	callback(null, returnData);
 };
 
 SocketUser.getOnlineAnonCount = function(socket, data, callback) {

src/user.js

@@ -537,31 +537,21 @@ var bcrypt = require('bcrypt'),
 
 	User.follow = function(uid, followid, callback) {
 		db.setAdd('following:' + uid, followid, function(err, data) {
-			if (!err) {
+			if(err) {
-				db.setAdd('followers:' + followid, uid, function(err, data) {
+				return callback(err);
-					if (!err) {
-						callback(true);
-					} else {
-						console.log(err);
-						callback(false);
-					}
-				});
-			} else {
-				console.log(err);
-				callback(false);
 			}
+
+			db.setAdd('followers:' + followid, uid, callback);
 		});
 	};
 
 	User.unfollow = function(uid, unfollowid, callback) {
 		db.setRemove('following:' + uid, unfollowid, function(err, data) {
-			if (!err) {
+			if(err) {
-				db.setRemove('followers:' + unfollowid, uid, function(err, data) {
+				return callback(err);
-					callback(data);
-				});
-			} else {
-				console.log(err);
 			}
+
+			db.setRemove('followers:' + unfollowid, uid, callback);
 		});
 	};