From 8396b7d36c8eeaa856686baa73d19a9d01ab52dc Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Mon, 7 May 2012 11:58:29 +1200 Subject: [PATCH] Removed DerpCode --- plugins/geoip.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/geoip.py b/plugins/geoip.py index 472cfe6..2dfa45f 100755 --- a/plugins/geoip.py +++ b/plugins/geoip.py @@ -25,17 +25,14 @@ def timezone(ip): @hook.command @hook.command("location") -def geoip(inp, say=None, nick=None, host=None, bot=None): +def geoip(inp, say=None, bot=None): ".geoip - Performs a location check on ." api_key = bot.config.get("api_keys", {}).get("geoip", None) if api_key is None: return "error: no api key set" - if inp == nick: - ip = host - else: - ip = inp - give = find_location(ip, api_key) - if give["country"] not in ["", " ", "-", " - "]: + + give = find_location(inp, api_key) + if give["country"] not in ["", " ", "-", " - ", None]: if give["state"] == give["city"]: localstring = give["city"] else: