Added inspircd 310 RPL_WHOISHELPOP and 335 RPL_WHOISBOT numerics

diff --git a/server/irc/commands.js b/server/irc/commands.js
index 96927dcbb72bba62820e9e197d54f6c0ffb91862..bdf2038661a6901f139592b54cf9e673af83e6b9 100644 (file)
--- a/server/irc/commands.js
+++ b/server/irc/commands.js
@@ -20,6 +20,7 @@ irc_numerics = {
     '266': 'RPL_GLOBALUSERS',
     '301': 'RPL_AWAY',
     '307': 'RPL_WHOISREGNICK',
+    '310': 'RPL_WHOIHELPOP',
     '311': 'RPL_WHOISUSER',
     '312': 'RPL_WHOISSERVER',
     '313': 'RPL_WHOISOPERATOR',
@@ -38,6 +39,7 @@ irc_numerics = {
     '331': 'RPL_NOTOPIC',
     '332': 'RPL_TOPIC',
     '333': 'RPL_TOPICWHOTIME',
+    '335': 'RPL_WHOISBOT',
     '341': 'RPL_INVITING',
     '352': 'RPL_WHOREPLY',
     '353': 'RPL_NAMEREPLY',
@@ -184,6 +186,20 @@ handlers = {
         });
     },
 
+    'RPL_WHOISHELPOP': function (command) {
+        this.irc_connection.emit('user ' + command.params[1] + ' whoishelpop', {
+            nick: command.params[1],
+            msg: command.params[command.params.length - 1]
+        });
+    },
+
+    'RPL_WHOISBOT': function (command) {
+        this.irc_connection.emit('user ' + command.params[1] + ' whoisbot', {
+            nick: command.params[1],
+            msg: command.params[command.params.length - 1]
+        });
+    },
+
     'RPL_WHOISSERVER': function (command) {
         this.irc_connection.emit('user ' + command.params[1] + ' whoisserver', {
             nick: command.params[1],

diff --git a/server/irc/user.js b/server/irc/user.js
index 67303e6cd5913369b28a2c1eb2b7baa3d84dab58..48148280c86fc53ac674892aa03b36bb15eb986d 100755 (executable)
--- a/server/irc/user.js
+++ b/server/irc/user.js
@@ -20,6 +20,8 @@ var IrcUser = function (irc_connection, nick) {
         whoishost:      onWhoisHost,\r
         whoissecure:    onWhoisSecure,\r
         whoisaccount:   onWhoisAccount,\r
+        whoishelpop:   onWhoisHelpOp,\r
+        whoisbot:              onWhoisBot,\r
         endofwhois:     onWhoisEnd,\r
         whowas:         onWhoWas,\r
         endofwhowas:    onWhoWasEnd,\r
@@ -168,6 +170,22 @@ function onWhoisAccount(event) {
     });\r
 }\r
 \r
+function onWhoisHelpOp(event) {\r
+    this.irc_connection.clientEvent('whois', {\r
+        nick: event.nick,\r
+        msg: event.msg,\r
+        end: false\r
+    });\r
+}\r
+\r
+function onWhoisBot(event) {\r
+    this.irc_connection.clientEvent('whois', {\r
+        nick: event.nick,\r
+        msg: event.msg,\r
+        end: false\r
+    });\r
+}\r
+\r
 function onWhoisEnd(event) {\r
     this.irc_connection.clientEvent('whois', {\r
         nick: event.nick,\r