From 181c6ccfeb04f5030f0230dce93b8a76c43ecc56 Mon Sep 17 00:00:00 2001 From: jomo Date: Mon, 20 Apr 2015 20:39:00 +0200 Subject: show network AS in /check --- check.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'check.py') diff --git a/check.py b/check.py index 8bbfdeb..2129a3b 100644 --- a/check.py +++ b/check.py @@ -42,11 +42,6 @@ def get_website_data(player): return ("http://redstoner.com/users/%s" % results[0][0], results[0][1]) if results else (None, None) -# receive country based on the user's IP -def get_country(data): - return str(data.get("country")) - - def get_all_names(player): uuid = str(uid(player)).replace("-", "") names = json.load(urllib2.urlopen("https://api.mojang.com/user/profiles/%s/names" % uuid)) @@ -69,7 +64,8 @@ def get_all_data(sender, player): msg(sender, "&6> Website account: &e%s" % website[0]) msg(sender, "&6> email: &e%s" % website[1]) msg(sender, "&7 -- Data provided by ipinfo.io") - msg(sender, "&6> Country: &e%s" % get_country(data)) + msg(sender, "&6> Country: &e%s" % str(data.get("country"))) + msg(sender, "&6> Network: &e%s" % str(data.get("org"))) msg(sender, "&7 -- Data provided by Mojang") msg(sender, "&6> All ingame names used so far: &e%s" % get_all_names(player)) except: -- cgit v1.2.3