Fix clashing object keys in RPL_WHOISSERVER

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index a677a76e93d390b16c6f7be41eef12d9f69ae17c..916710def8a0392d7ad9b2f0a974fdaae0773950 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -555,7 +555,7 @@ kiwi.model.Application = function () {
                     panel.addMsg(event.nick, 'is ' + event.nick + '!' + event.ident + '@' + event.host + ' * ' + event.msg, 'whois');\r
                 } else if (event.chans) {\r
                     panel.addMsg(event.nick, 'on ' + event.chans, 'whois');\r
-                } else if (event.server) {\r
+                } else if (event.irc_server) {\r
                     panel.addMsg(event.nick, 'using ' + event.server, 'whois');\r
                 } else if (event.msg) {\r
                     panel.addMsg(event.nick, event.msg, 'whois');\r

diff --git a/server/irc/commands.js b/server/irc/commands.js
index 6e71edffab3112d10e4028614b74d28fb49a4700..afeb4ed2d724887dab11e8183b39461afb1437f7 100644 (file)
--- a/server/irc/commands.js
+++ b/server/irc/commands.js
@@ -123,7 +123,7 @@ var listeners = {
                                command.command = 'RPL_WHOISSERVER';
                                this.client.sendIrcCommand(command);*/
                 //websocket.sendClientEvent('whois', {server: '', nick: msg.params.split(" ", 3)[1], "msg": msg.trailing, end: false});
-                this.client.sendIrcCommand('whois', {server: this.con_num, nick: command.params[1], server: command.params[2], end: false});
+                this.client.sendIrcCommand('whois', {server: this.con_num, nick: command.params[1], irc_server: command.params[2], end: false});
             },
     'RPL_WHOISOPERATOR':      function (command) {
                                /*command.server = this.con_num;