Merge pull request #249 from awestroke/master

Send NOTICE messages to the correct channel
This commit is contained in:
Mattias Erming 2014-10-27 22:48:34 +01:00
commit 83b2b17079

View File

@ -1,9 +1,19 @@
var _ = require("lodash");
var Msg = require("../../models/msg"); var Msg = require("../../models/msg");
module.exports = function(irc, network) { module.exports = function(irc, network) {
var client = this; var client = this;
irc.on("notice", function(data) { irc.on("notice", function(data) {
var lobby = network.channels[0]; var target = data.to;
if (target.toLowerCase() == irc.me.toLowerCase()) {
target = data.from;
}
var chan = _.findWhere(network.channels, {name: target});
if (typeof chan === "undefined") {
chan = network.channels[0];
}
var from = data.from || ""; var from = data.from || "";
if (data.to == "*" || data.from.indexOf(".") !== -1) { if (data.to == "*" || data.from.indexOf(".") !== -1) {
from = ""; from = "";
@ -13,9 +23,9 @@ module.exports = function(irc, network) {
from: from, from: from,
text: data.message text: data.message
}); });
lobby.messages.push(msg); chan.messages.push(msg);
client.emit("msg", { client.emit("msg", {
chan: lobby.id, chan: chan.id,
msg: msg msg: msg
}); });
}); });