diff --git a/exec/ircbots/weather/weather_functions.js b/exec/ircbots/weather/weather_functions.js index 08cfdf44075ecce29d64d708b1c192a1b7d31c58..1b6c9ef0bb9b7cbebe65f24de910c272d94c6f60 100644 --- a/exec/ircbots/weather/weather_functions.js +++ b/exec/ircbots/weather/weather_functions.js @@ -11,11 +11,11 @@ function get_nicklocation(srv,nick) if(userhost.indexOf('.')==-1) userhost += (srv.users[cmd[1].toUpperCase()].servername.replace(/^[^\.]+\./,'.')); geo=get_geoip(userhost); - ret=geo.Latitude+','+geo.Longitude; + ret=geo.latitude+','+geo.longitude; if(ret=='0,0') { userhost=srv.users[nick.toUpperCase()].servername geo=get_geoip(userhost); - ret=geo.Latitude+','+geo.Longitude; + ret=geo.latitude+','+geo.longitude; } return ret; } diff --git a/exec/ircbots/whereis/whereis.js b/exec/ircbots/whereis/whereis.js index 55727ddd59a7413f6ceb8d0d8d47fbda3355e441..55d79c14d5911364d480c9f7c2ff8b57ddef2b68 100644 --- a/exec/ircbots/whereis/whereis.js +++ b/exec/ircbots/whereis/whereis.js @@ -18,7 +18,7 @@ Bot_Commands["WHEREIS"].command = function (target,onick,ouh,srv,lvl,cmd) { if(userhost.indexOf('.')==-1) userhost += (srv.users[nick.toUpperCase()].servername.replace(/^[^\.]+\./,'.')); geo=get_geoip(userhost); - if(geo.CountryName=='Reserved') { + if(geo.countryName=='Reserved') { userhost=srv.users[nick.toUpperCase()].servername geo=get_geoip(userhost); } @@ -49,16 +49,16 @@ Bot_Commands["WHEREIS"].command = function (target,onick,ouh,srv,lvl,cmd) { location=get_nicklocation(find); if (location) { lstr=find+' is '; - if(location.City=='') + if(location.cityName=='') lstr += 'somewhere in '; else - lstr += 'around '+location.City+', '; + lstr += 'around '+location.cityName+', '; - if(location.RegionName!='') - lstr += location.RegionName+', '; + if(location.regionName!='') + lstr += location.regionName+', '; - if(location.CountryName!='') - lstr += location.CountryName; + if(location.countryName!='') + lstr += location.countryName; } else { var usr = new User(system.matchuser(cmd[1]));