Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix

public/src/modules/chat.js

@@ -13,13 +13,13 @@ define(['taskbar', 'string'], function(taskbar, S) {
 				return;
 			}
 
-			socket.emit('modules.chats.list', function(chats) {
+			socket.emit('modules.chats.list', function(err, chats) {
 				var	chatsFrag = document.createDocumentFragment(),
 					chatEl = document.createElement('li'),
 					numChats = chats.length,
 					x, userObj;
 
-				if (numChats > 0) {
+				if (!err && numChats > 0) {
 					for(x=0;x<numChats;x++) {
 						userObj = chats[x];
 						chatEl.setAttribute('data-uid', userObj.uid);
@@ -191,7 +191,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
 	}
 
 	function getChatMessages(chatModal, callback) {
-		socket.emit('modules.chats.get', {touid:chatModal.touid}, function(messages) {
+		socket.emit('modules.chats.get', {touid:chatModal.touid}, function(err, messages) {
 			for(var i = 0; i<messages.length; ++i) {
 				module.appendChatMessage(chatModal, messages[i].content, messages[i].timestamp);
 			}

public/src/modules/composer.js

@@ -47,7 +47,7 @@ define(['taskbar'], function(taskbar) {
 		if(allowed()) {
 			socket.emit('modules.composer.push', {
 				pid: pid
-			}, function(threadData) {
+			}, function(err, threadData) {
 				push({
 					pid: pid,
 					title: threadData.title,
@@ -108,8 +108,8 @@ define(['taskbar'], function(taskbar) {
 			} else if (parseInt(postData.pid) > 0) {
 				titleEl.val(postData.title);
 				titleEl.prop('readOnly', true);
-				socket.emit('modules.composer.editCheck', postData.pid, function(editCheck) {
+				socket.emit('modules.composer.editCheck', postData.pid, function(err, editCheck) {
-					if (editCheck.titleEditable) {
+					if (!err && editCheck.titleEditable) {
 						postContainer.find('input').prop('readonly', false);
 					}
 				});

public/src/modules/notifications.js

@@ -11,14 +11,14 @@ define(function() {
 		notifTrigger.addEventListener('click', function(e) {
 			e.preventDefault();
 			if (notifContainer.className.indexOf('open') === -1) {
-				socket.emit('notifications.get', null, function(data) {
+				socket.emit('notifications.get', null, function(err, data) {
 					var notifFrag = document.createDocumentFragment(),
 						notifEl = document.createElement('li'),
 						numRead = data.read.length,
 						numUnread = data.unread.length,
 						x;
 					notifList.innerHTML = '';
-					if ((data.read.length + data.unread.length) > 0) {
+					if (!err && (data.read.length + data.unread.length) > 0) {
 						for (x = 0; x < numUnread; x++) {
 							notifEl.setAttribute('data-nid', data.unread[x].nid);
 							notifEl.className = 'unread';
@@ -51,13 +51,15 @@ define(function() {
 						notifIcon.toggleClass('active', false);
 					}
 
-					socket.emit('modules.notifications.mark_all_read', null, function() {
+					socket.emit('modules.notifications.mark_all_read', null, function(err) {
-						notifIcon.toggleClass('active', false);
+						if (!err) {
-						app.refreshTitle();
+							notifIcon.toggleClass('active', false);
+							app.refreshTitle();
 
-						// Update favicon + local count
+							// Update favicon + local count
-						Tinycon.setBubble(0);
+							Tinycon.setBubble(0);
-						localStorage.setItem('notifications:count', 0);
+							localStorage.setItem('notifications:count', 0);
+						}
 					});
 				});
 			}

src/socket.io/modules.js

@@ -11,6 +11,7 @@ var	posts = require('../posts'),
 	async = require('async'),
 	S = require('string'),
 	winston = require('winston'),
+	server = require('./'),
 
 	SocketModules = {};
 
@@ -32,7 +33,7 @@ SocketModules.composer.push = function(socket, data, callback) {
 					});
 				}
 			], function(err, results) {
-				callback({
+				callback(err, {
 					title: results[1],
 					pid: data.pid,
 					body: results[0].content
@@ -40,7 +41,7 @@ SocketModules.composer.push = function(socket, data, callback) {
 			});
 		}
 	} else {
-		callback({
+		callback(null, {
 			error: 'no-uid'
 		});
 	}
@@ -48,8 +49,12 @@ SocketModules.composer.push = function(socket, data, callback) {
 
 SocketModules.composer.editCheck = function(socket, pid, callback) {
 	posts.getPostField(pid, 'tid', function(err, tid) {
+		if (err) {
+			return callback(err);
+		}
+
 		postTools.isMain(pid, tid, function(err, isMain) {
-			callback({
+			callback(err, {
 				titleEditable: isMain
 			});
 		});
@@ -62,13 +67,7 @@ SocketModules.chats = {};
 
 SocketModules.chats.get = function(socket, data, callback) {
 	var touid = data.touid;
-	Messaging.getMessages(socket.uid, touid, function(err, messages) {
+	Messaging.getMessages(socket.uid, touid, callback);
-		if (err) {
-			return callback(null);
-		}
-
-		callback(messages);
-	});
 };
 
 SocketModules.chats.send = function(socket, data) {
@@ -102,11 +101,11 @@ SocketModules.chats.send = function(socket, data) {
                 var numSockets = 0,
                     x;
 
-                if (socket.userSockets[touid]) {
+                if (server.userSockets[touid]) {
-                    numSockets = socket.userSockets[touid].length;
+                    numSockets = server.userSockets[touid].length;
 
                     for (x = 0; x < numSockets; ++x) {
-                        socket.userSockets[touid][x].emit('event:chats.receive', {
+                        server.userSockets[touid][x].emit('event:chats.receive', {
                             fromuid: socket.uid,
                             username: username,
                             // todo this isnt very nice, but can't think of a better way atm
@@ -116,12 +115,12 @@ SocketModules.chats.send = function(socket, data) {
                     }
                 }
 
-                if (socket.userSockets[socket.uid]) {
+                if (server.userSockets[socket.uid]) {
 
-                    numSockets = socket.userSockets[socket.uid].length;
+                    numSockets = server.userSockets[socket.uid].length;
 
                     for (x = 0; x < numSockets; ++x) {
-                        socket.userSockets[socket.uid][x].emit('event:chats.receive', {
+                        server.userSockets[socket.uid][x].emit('event:chats.receive', {
                             fromuid: touid,
                             username: toUsername,
                             message: parsed,
@@ -135,13 +134,7 @@ SocketModules.chats.send = function(socket, data) {
 };
 
 SocketModules.chats.list = function(socket, data, callback) {
-	Messaging.getRecentChats(socket.uid, function(err, uids) {
+	Messaging.getRecentChats(socket.uid, callback);
-		if (err) {
-			winston.warn('[(socket) chats.list] Problem retrieving chats: ' + err.message);
-		}
-
-		callback(uids || []);
-	});
 };
 
 /* Notifications */
@@ -153,11 +146,7 @@ SocketModules.notifications.mark_read = function(socket, nid) {
 };
 
 SocketModules.notifications.mark_all_read = function(socket, data, callback) {
-	notifications.mark_all_read(socket.uid, function(err) {
+	notifications.mark_all_read(socket.uid, callback);
-		if (!err) {
-			callback();
-		}
-	});
 };
 
 module.exports = SocketModules;

src/socket.io/notifications.js

@@ -1,17 +1,15 @@
+"use strict";
+
 var	user = require('../user'),
 
 	SocketNotifs = {};
 
 SocketNotifs.get = function(socket, data, callback) {
-	user.notifications.get(socket.uid, function(notifs) {
+	user.notifications.get(socket.uid, callback);
-		callback(notifs);
-	});
 };
 
 SocketNotifs.getCount = function(socket, data, callback) {
-	user.notifications.getUnreadCount(socket.uid, function(err, count) {
+	user.notifications.getUnreadCount(socket.uid, callback);
-		callback(err ? err.message : null, count);
-	});
 };
 
 module.exports = SocketNotifs;

src/user.js

@@ -1016,7 +1016,7 @@ var bcrypt = require('bcrypt'),
 					notifications.read.length = maxNotifs - notifications.unread.length;
 				}
 
-				callback(notifications);
+				callback(err, notifications);
 			});
 		},
 		getAll: function(uid, limit, before, callback) {