better way of finding what channels a user is in

Generate the correct list of channels where the user is in (for commands: QUIT, NICK and KILL)
matrix-org · Jun 12, 2015 · 08f9e01 · 08f9e01
1 parent f7bfd7d
commit 08f9e01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/irc.js b/lib/irc.js
@@ -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
@@ -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;
@@ -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

diff --git a/package.json b/package.json
@@ -14,7 +14,8 @@
     "Justin Gallardo <[email protected]>",
     "Chris Nehren <[email protected]>",
     "Henri Niemeläinen <[email protected]>",
-    "Alex Miles <[email protected]>"
+    "Alex Miles <[email protected]>",
+    "Andrei Husanu <[email protected]>"
   ],
   "repository": {
     "type": "git",