Weather and Whereis previously expected different return types from

get_nicklocaiton().

exec/ircbots/weather/weather_commands.js

@@ -19,7 +19,7 @@ Bot_Commands["WEATHER"].command = function (target,onick,ouh,srv,lvl,cmd) {
 		srv.o(target, nick+', who the f^@% is '+nick+"?");
 	}
 	else {
-		lstr=get_nicklocation(srv.users[nick.toUpperCase()].uh, srv.users[nick.toUpperCase()].servername, nick);
+		lstr=get_nickcoords(srv.users[nick.toUpperCase()].uh, srv.users[nick.toUpperCase()].servername, nick);
 		if (!lstr) {
 			var usr = new User(system.matchuser(nick));
 			if (typeof(usr)=='object')
@@ -98,7 +98,7 @@ Bot_Commands["FORECAST"].command = function (target,onick,ouh,srv,lvl,cmd) {
 	cmd.shift();
 	if(cmd[0])
 		nick=cmd[0];
-	lstr=get_nicklocation(srv.users[nick.toUpperCase()].uh, srv.users[nick.toUpperCase()].servername, nick);
+	lstr=get_nickcoords(srv.users[nick.toUpperCase()].uh, srv.users[nick.toUpperCase()].servername, nick);
 	if (!lstr) {
 		var usr = new User(system.matchuser(nick));
 		if (typeof(usr)=='object')

exec/ircbots/weather/weather_functions.js

@@ -2,3 +2,15 @@ if(js.global.get_geoip==undefined)
 	js.global.load(js.global, "geoip.js");
 if(js.global.get_nicklocation==undefined)
 	js.global.load(js.global, "nicklocate.js");
+
+function get_nickcoords(uh, sn, n) {
+	var geo=get_nicklocation(uh, sn, n);
+	var ret=geo.latitude+','+geo.longitude;
+	if(ret=='0,0') {
+		userhost=srvhost;
+		geo=get_geoip(userhost);
+		ret=geo.latitude+','+geo.longitude;
+	}
+	return ret;
+}
+