From 90ce92dc39395444862edfc7946ef7a1195f2464 Mon Sep 17 00:00:00 2001 From: dngfx Date: Fri, 31 Aug 2018 10:51:47 +0100 Subject: Revert "Reformat" This reverts commit abed9cf --- modules/geoip.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'modules/geoip.py') diff --git a/modules/geoip.py b/modules/geoip.py index 97ea6635..7615575c 100644 --- a/modules/geoip.py +++ b/modules/geoip.py @@ -2,10 +2,8 @@ import Utils URL_GEOIP = "http://ip-api.com/json/%s" - class Module(object): _name = "GeoIP" - def __init__(self, bot): bot.events.on("received").on("command").on("geoip").hook( self.geoip, min_args=1, @@ -14,17 +12,17 @@ class Module(object): def geoip(self, event): page = Utils.get_url(URL_GEOIP % event["args_split"][0], - json=True) + json=True) if page: if page["status"] == "success": - data = page["query"] + data = page["query"] data += " | Organisation: %s" % page["org"] data += " | City: %s" % page["city"] data += " | Region: %s (%s)" % (page["regionName"], - page["countryCode"]) + page["countryCode"]) data += " | ISP: %s" % page["isp"] data += " | Lon/Lat: %s/%s" % (page["lon"], - page["lat"]) + page["lat"]) data += " | Timezone: %s" % page["timezone"] event["stdout"].write(data) else: -- cgit v1.3.1-10-gc9f91