From a34775a6c275100c6f6d92b0aa2bdb6f7349022a Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Fri, 17 Jan 2014 12:52:04 -0500 Subject: [PATCH] meta fixes --- src/socket.io/meta.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index 03d731fd81..9c8d2b8ed8 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -30,12 +30,14 @@ SocketMeta.reconnected = function(socket) { }; SocketMeta.buildTitle = function(socket, text, callback) { - meta.title.build(text, function(err, title) { - callback(err, title); - }); + meta.title.build(text, callback); }; SocketMeta.updateHeader = function(socket, data, callback) { + if(!data) { + return callback(new Error('invalid data')); + } + if (socket.uid) { user.getUserFields(socket.uid, data.fields, function(err, fields) { if(err) { @@ -46,7 +48,7 @@ SocketMeta.updateHeader = function(socket, data, callback) { fields.uid = socket.uid; callback(null, fields); } else { - callback([]); + callback(null, []); } }); } else { @@ -73,6 +75,10 @@ SocketMeta.getUsageStats = function(socket, data, callback) { SocketMeta.rooms = {}; SocketMeta.rooms.enter = function(socket, data) { + if(!data) { + return callback(new Error('invalid data')); + } + if (data.leave !== null) { socket.leave(data.leave); }