Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions lib/irc.js
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,14 @@ function Client(server, nick, opt) {

channels = [];

// TODO better way of finding what channels a user is in?
// finding what channels a user is in
Object.keys(self.chans).forEach(function(channame) {
var channel = self.chans[channame];
channel.users[message.args[0]] = channel.users[message.nick];
delete channel.users[message.nick];
channels.push(channame);
if (message.nick in channel.users) {
channel.users[message.args[0]] = channel.users[message.nick];
delete channel.users[message.nick];
channels.push(channame);
}
});

// old nick, new nick, channels
Expand Down Expand Up @@ -501,8 +503,10 @@ function Client(server, nick, opt) {
channels = [];
Object.keys(self.chans).forEach(function(channame) {
var channel = self.chans[channame];
channels.push(channame);
delete channel.users[nick];
if (nick in channel.users) {
channels.push(channame);
delete channel.users[nick];
}
});
self.emit('kill', nick, message.args[1], channels, message);
break;
Expand Down Expand Up @@ -544,11 +548,13 @@ function Client(server, nick, opt) {

channels = [];

// TODO better way of finding what channels a user is in?
// finding what channels a user is in?
Object.keys(self.chans).forEach(function(channame) {
var channel = self.chans[channame];
delete channel.users[message.nick];
channels.push(channame);
if (message.nick in channel.users) {
delete channel.users[message.nick];
channels.push(channame);
}
});

// who, reason, channels
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"Justin Gallardo <justin.gallardo@gmail.com>",
"Chris Nehren <cnehren@pobox.com>",
"Henri Niemeläinen <aivot-on@iki.fi>",
"Alex Miles <ghostaldev@gmail.com>"
"Alex Miles <ghostaldev@gmail.com>",
"Andrei Husanu <node-irc@andreihusanu.ro>"
],
"repository": {
"type": "git",
Expand Down