Merge pull request #241 from Junky2k/master

check if an user is present in the channel for nickchange

Author: ekmartin

lib/bot.js

@@ -130,9 +130,11 @@ class Bot {
       channels.forEach((channelName) => {
         const channel = channelName.toLowerCase();
         if (this.channelUsers[channel]) {
-          this.channelUsers[channel].delete(oldNick);
-          this.channelUsers[channel].add(newNick);
-          this.sendExactToDiscord(channel, `*${oldNick}* is now known as ${newNick}`);
+          if (this.channelUsers[channel].has(oldNick)) {
+            this.channelUsers[channel].delete(oldNick);
+            this.channelUsers[channel].add(newNick);
+            this.sendExactToDiscord(channel, `*${oldNick}* is now known as ${newNick}`);
+          }
         } else {
           logger.warn(`No channelUsers found for ${channel} when ${oldNick} changed.`);
         }

test/bot-events.test.js

@@ -124,18 +124,22 @@ describe('Bot Events', function () {
   it('should send name change event to discord', function () {
     const channel1 = '#channel1';
     const channel2 = '#channel2';
+    const channel3 = '#channel3';
     const oldNick = 'user1';
     const newNick = 'user2';
+    const user3 = 'user3';
     const bot = createBot({ ...config, ircStatusNotices: true });
+    const staticChannel = new Set([bot.nickname, user3]);
     bot.connect();
-    bot.ircClient.emit('names', '#channel1', { [bot.nickname]: '', [oldNick]: '' });
+    bot.ircClient.emit('names', channel1, { [bot.nickname]: '', [oldNick]: '' });
+    bot.ircClient.emit('names', channel2, { [bot.nickname]: '', [user3]: '' });
     const channelNicksPre = new Set([bot.nickname, oldNick]);
-    bot.channelUsers.should.deep.equal({ '#channel1': channelNicksPre });
+    bot.channelUsers.should.deep.equal({ '#channel1': channelNicksPre, '#channel2': staticChannel });
     const formattedText = `*${oldNick}* is now known as ${newNick}`;
     const channelNicksAfter = new Set([bot.nickname, newNick]);
-    bot.ircClient.emit('nick', oldNick, newNick, [channel1, channel2]);
+    bot.ircClient.emit('nick', oldNick, newNick, [channel1, channel2, channel3]);
     bot.sendExactToDiscord.should.have.been.calledWithExactly(channel1, formattedText);
-    bot.channelUsers.should.deep.equal({ '#channel1': channelNicksAfter });
+    bot.channelUsers.should.deep.equal({ '#channel1': channelNicksAfter, '#channel2': staticChannel });
   });
 
   it('should send actions to discord', function () {