Rename 'host' to 'hostname' in whois client event

Fixes #511

diff --git a/client/src/models/network.js b/client/src/models/network.js
index b4a1d9b3104af2266217eeac7a032ab38d816681..6673bc43ea73bba14d742bc1381c5f415fa43b4c 100644 (file)
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@ -706,7 +706,7 @@
 
         panel = _kiwi.app.panels().active;
         if (event.ident) {
-            panel.addMsg(event.nick, styleText('whois_ident', {nick: event.nick, ident: event.ident, host: event.host, text: event.msg}), 'whois');
+            panel.addMsg(event.nick, styleText('whois_ident', {nick: event.nick, ident: event.ident, host: event.hostname, text: event.msg}), 'whois');
 
         } else if (event.chans) {
             panel.addMsg(event.nick, styleText('whois_channels', {nick: event.nick, text: translateText('client_models_network_channels', [event.chans])}), 'whois');
@@ -735,7 +735,7 @@
 
         panel = _kiwi.app.panels().active;
         if (event.host) {
-            panel.addMsg(event.nick, styleText('who', {nick: event.nick, ident: event.ident, host: event.host, realname: event.real_name, text: event.msg}), 'whois');
+            panel.addMsg(event.nick, styleText('who', {nick: event.nick, ident: event.ident, host: event.hostname, realname: event.real_name, text: event.msg}), 'whois');
         } else {
             panel.addMsg(event.nick, styleText('whois_notfound', {nick: event.nick, text: translateText('client_models_network_nickname_notfound', [])}), 'whois');
         }

diff --git a/server/irc/user.js b/server/irc/user.js
index 89f8035830ffc99d8d17c503eb5b18f0a33c033e..91d10f8b2f90421f0564ddbc1f310f6176a72173 100755 (executable)
--- a/server/irc/user.js
+++ b/server/irc/user.js
@@ -85,7 +85,7 @@ function onWhoisUser(event) {
     this.irc_connection.clientEvent('whois', {\r
         nick: event.nick,\r
         ident: event.ident,\r
-        host: event.host,\r
+        hostname: event.host,\r
         msg: event.msg,\r
         end: false\r
     });\r
@@ -209,7 +209,7 @@ function onWhoWas(event) {
     this.irc_connection.clientEvent('whowas', {\r
         nick: event.nick,\r
         ident: event.user,\r
-        host: event.host,\r
+        hostname: event.host,\r
         real_name: event.real_name,\r
         end: false\r
     });\r