summaryrefslogtreecommitdiff
path: root/check.py
diff options
context:
space:
mode:
authorDico200 <dico.karssiens@gmail.com>2015-05-05 16:50:55 +0200
committerDico200 <dico.karssiens@gmail.com>2015-05-05 16:50:55 +0200
commit6865e2c3b9142a6ec6ea1a425daffb3814c2d965 (patch)
tree65956e7ee598a9f7f1fa3a13a0ce51cf2fe7321a /check.py
parenteaf0f41746b027ae1951679f2c2824a1ab6502ba (diff)
Revert "show network AS in /check"
This reverts commit 181c6ccfeb04f5030f0230dce93b8a76c43ecc56.
Diffstat (limited to 'check.py')
-rw-r--r--check.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/check.py b/check.py
index 2129a3b..8bbfdeb 100644
--- a/check.py
+++ b/check.py
@@ -42,6 +42,11 @@ 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))
@@ -64,8 +69,7 @@ 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" % str(data.get("country")))
- msg(sender, "&6> Network: &e%s" % str(data.get("org")))
+ msg(sender, "&6> Country: &e%s" % get_country(data))
msg(sender, "&7 -- Data provided by Mojang")
msg(sender, "&6> All ingame names used so far: &e%s" % get_all_names(player))
except: