From 9e523191ea40137899c0082ffff66056ec289e52 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 2 Apr 2013 23:15:16 +0100
Subject: [PATCH 1/3] whoops padid should be in payload..

---
 src/node/handler/PadMessageHandler.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 954c116d..b6e58764 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -151,19 +151,25 @@ exports.handleMessage = function(client, message)
 
   var handleMessageHook = function(callback){
     var dropMessage = false;
-    
+    console.warn("messsssage", message);
     // Call handleMessage hook. If a plugin returns null, the message will be dropped. Note that for all messages 
     // handleMessage will be called, even if the client is not authorized
     hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) {
+console.warn("Wut", message);
       if(ERR(err, callback)) return;
       _.each(messages, function(newMessage){
+console.warn("OH NOES!", message);
+console.warn("newMessage", newMessage);
         if ( newMessage === null ) {
+console.warn("FUCK NO!");
           dropMessage = true;
         }
       });
       
       // If no plugins explicitly told us to drop the message, its ok to proceed
-      if(!dropMessage){ callback() };
+      if(!dropMessage){
+console.warn("proceeding");
+ callback() };
     });
   }
 
@@ -265,7 +271,7 @@ exports.handleCustomObjectMessage = function (msg, sessionID, cb) {
     if(sessionID){ // If a sessionID is targeted then send directly to this sessionID
       socketio.sockets.socket(sessionID).json.send(msg); // send a targeted message
     }else{
-      socketio.sockets.in(msg.data.padId).json.send(msg); // broadcast to all clients on this pad
+      socketio.sockets.in(msg.data.payload.padId).json.send(msg); // broadcast to all clients on this pad
     }
   }
   cb(null, {});

From 57a9ccbb881a487caa92d41431403f274efe1ed8 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 2 Apr 2013 23:16:28 +0100
Subject: [PATCH 2/3] whoops, comments hurt

---
 src/node/handler/PadMessageHandler.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index b6e58764..0b0ea369 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -151,24 +151,18 @@ exports.handleMessage = function(client, message)
 
   var handleMessageHook = function(callback){
     var dropMessage = false;
-    console.warn("messsssage", message);
     // Call handleMessage hook. If a plugin returns null, the message will be dropped. Note that for all messages 
     // handleMessage will be called, even if the client is not authorized
     hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) {
-console.warn("Wut", message);
       if(ERR(err, callback)) return;
       _.each(messages, function(newMessage){
-console.warn("OH NOES!", message);
-console.warn("newMessage", newMessage);
         if ( newMessage === null ) {
-console.warn("FUCK NO!");
           dropMessage = true;
         }
       });
       
       // If no plugins explicitly told us to drop the message, its ok to proceed
       if(!dropMessage){
-console.warn("proceeding");
  callback() };
     });
   }

From 5855e3d5bfffa9aed9747cc54fa5922a32737be9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 2 Apr 2013 23:17:25 +0100
Subject: [PATCH 3/3] weird styling

---
 src/node/handler/PadMessageHandler.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 0b0ea369..9d0fd780 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -162,8 +162,7 @@ exports.handleMessage = function(client, message)
       });
       
       // If no plugins explicitly told us to drop the message, its ok to proceed
-      if(!dropMessage){
- callback() };
+      if(!dropMessage){ callback() };
     });
   }