libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

whoops padid should be in payload..

Browse source
This commit is contained in:
John McLear 2013-04-02 23:15:16 +01:00
parent 8b1a11d5d8
commit 9e523191ea
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/node/handler/PadMessageHandler.js
View file

@ -151,19 +151,25 @@ exports.handleMessage = function(client, message)
var handleMessageHook = function(callback){ var handleMessageHook = function(callback){
var dropMessage = false; 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 // 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 // handleMessage will be called, even if the client is not authorized
hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) { hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) {
console.warn("Wut", message);
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
_.each(messages, function(newMessage){ _.each(messages, function(newMessage){
console.warn("OH NOES!", message);
console.warn("newMessage", newMessage);
if ( newMessage === null ) { if ( newMessage === null ) {
console.warn("FUCK NO!");
dropMessage = true; dropMessage = true;
} }
}); });
// If no plugins explicitly told us to drop the message, its ok to proceed // 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 if(sessionID){ // If a sessionID is targeted then send directly to this sessionID
socketio.sockets.socket(sessionID).json.send(msg); // send a targeted message socketio.sockets.socket(sessionID).json.send(msg); // send a targeted message
}else{ }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, {}); cb(null, {});