Merge pull request #236 from qq99/master

Fixes #235 type error where channel does not exist
martynsmith · May 29, 2014 · 61105b8 · 61105b8
2 parents 574f2b0 + 70db2d4
commit 61105b8
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/irc.js b/lib/irc.js
@@ -409,7 +409,9 @@ function Client(server, nick, opt) {
                 }
                 else {
                     var channel = self.chanData(message.args[0]);
-                    channel.users[message.nick] = '';
+                    if (channel && channel.users) {
+                        channel.users[message.nick] = '';
+                    }
                 }
                 self.emit('join', message.args[0], message.nick, message);
                 self.emit('join' + message.args[0], message.nick, message);
@@ -430,7 +432,9 @@ function Client(server, nick, opt) {
                 }
                 else {
                     var channel = self.chanData(message.args[0]);
-                    delete channel.users[message.nick];
+                    if (channel && channel.users) {
+                        delete channel.users[message.nick];
+                    }
                 }
                 break;
             case "KICK":
@@ -447,7 +451,9 @@ function Client(server, nick, opt) {
                 }
                 else {
                     var channel = self.chanData(message.args[0]);
-                    delete channel.users[message.args[1]];
+                    if (channel && channel.users) {
+                        delete channel.users[message.args[1]];
+                    }
                 }
                 break;
             case "KILL":