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

clean up check.py

Browse Source
This commit is contained in:
jomo
2015-01-10 22:44:18 +01:00
parent f9c6df58c5
commit 00fd8e4f1e
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
check.py
View File

@@ -39,16 +39,7 @@ def get_website_data(player):
results = curs.fetchall() results = curs.fetchall()
curs.close() curs.close()
conn.close() conn.close()
if len(results) == 1: return ("http://redstoner.com/users/%s" % results[0][0], results[0][1]) if results else (None, None)
if len(results[0]) == 2:
return {
"link": "http://redstoner.com/users/%s" % results[0][0],
"email": results[0][1]
}
else:
return {}
else:
return {}
# receive country based on the user's IP # receive country based on the user's IP
@@ -75,8 +66,8 @@ def get_all_data(sender, player):
msg(sender, "&6> First joined: &7(y-m-d h:m:s) &e%s" % get_first_join(player)) msg(sender, "&6> First joined: &7(y-m-d h:m:s) &e%s" % get_first_join(player))
msg(sender, "&6> Last seen: &7(y-m-d h:m:s) &e%s" % get_last_seen(player)) msg(sender, "&6> Last seen: &7(y-m-d h:m:s) &e%s" % get_last_seen(player))
website = get_website_data(player) website = get_website_data(player)
msg(sender, "&6> Website account: &e%s" % website.get("link")) msg(sender, "&6> Website account: &e%s" % website[0])
msg(sender, "&6> email: &e%s" % website.get("email")) 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" % get_country(data))
msg(sender, "&7 -- Data provided by Mojang") msg(sender, "&7 -- Data provided by Mojang")