ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of github.com:ClouDev/CloudBot into develop

Browse source
This commit is contained in:
Luke Rogers 2012-05-01 00:42:16 +12:00
commit 55a8b284b8
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/geoip.py
View file

@ -25,12 +25,16 @@ def timezone(ip):
@hook.command @hook.command
@hook.command("location") @hook.command("location")
def geoip(inp, say=None, bot=None): def geoip(inp, say=None, nick=None, host=None, bot=None):
".geoip <ip> - Performs a location check on <ip>." ".geoip <ip> - Performs a location check on <ip>."
api_key = bot.config.get("api_keys", {}).get("geoip", None) api_key = bot.config.get("api_keys", {}).get("geoip", None)
if api_key is None: if api_key is None:
return "error: no api key set" return "error: no api key set"
give = find_location(inp, api_key) if inp == nick:
ip = host
else:
ip = inp
give = find_location(ip, api_key)
if give["country"] not in ["", " ", "-", " - "]: if give["country"] not in ["", " ", "-", " - "]:
if give["state"] == give["city"]: if give["state"] == give["city"]:
localstring = give["city"] localstring = give["city"]