fix messaging.parse to be err first

v1.18.x
barisusakli 9 years ago
parent dfaa27b7fc
commit d272a63492

@ -128,7 +128,10 @@ var async = require('async'),
}); });
async.map(messages, function(message, next) { async.map(messages, function(message, next) {
Messaging.parse(message.content, message.fromuid, uid, roomId, isNew, function(result) { Messaging.parse(message.content, message.fromuid, uid, roomId, isNew, function(err, result) {
if (err) {
return next(err);
}
message.content = result; message.content = result;
message.cleanedContent = S(result).stripTags().decodeHTMLEntities().s; message.cleanedContent = S(result).stripTags().decodeHTMLEntities().s;
next(null, message); next(null, message);
@ -195,7 +198,7 @@ var async = require('async'),
Messaging.parse = function (message, fromuid, uid, roomId, isNew, callback) { Messaging.parse = function (message, fromuid, uid, roomId, isNew, callback) {
plugins.fireHook('filter:parse.raw', message, function(err, parsed) { plugins.fireHook('filter:parse.raw', message, function(err, parsed) {
if (err) { if (err) {
return callback(message); return callback(err);
} }
var messageData = { var messageData = {
@ -209,7 +212,7 @@ var async = require('async'),
}; };
plugins.fireHook('filter:messaging.parse', messageData, function(err, messageData) { plugins.fireHook('filter:messaging.parse', messageData, function(err, messageData) {
callback(messageData.parsedMessage); callback(err, messageData ? messageData.parsedMessage : '');
}); });
}); });
}; };

Loading…
Cancel
Save