Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

show network AS in /check

Browse Source
This commit is contained in:
jomo
2015-04-20 20:39:00 +02:00
parent 487375dd07
commit 181c6ccfeb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
check.py
View File

@@ -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) 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): def get_all_names(player):
uuid = str(uid(player)).replace("-", "") uuid = str(uid(player)).replace("-", "")
names = json.load(urllib2.urlopen("https://api.mojang.com/user/profiles/%s/names" % uuid)) 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> Website account: &e%s" % website[0])
msg(sender, "&6> email: &e%s" % website[1]) msg(sender, "&6> email: &e%s" % website[1])
msg(sender, "&7 -- Data provided by ipinfo.io") 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, "&7 -- Data provided by Mojang")
msg(sender, "&6> All ingame names used so far: &e%s" % get_all_names(player)) msg(sender, "&6> All ingame names used so far: &e%s" % get_all_names(player))
except: except: