diff --git a/.gitignore b/.gitignore index a8a3d96..c7c760d 100644 --- a/.gitignore +++ b/.gitignore @@ -162,4 +162,4 @@ cython_debug/ # token /discordtoken #images -Reuse/images \ No newline at end of file +/Reuse/images \ No newline at end of file diff --git a/Reuse/getLeaderboard.py b/Reuse/getLeaderboard.py index d872c59..4dd53ef 100644 --- a/Reuse/getLeaderboard.py +++ b/Reuse/getLeaderboard.py @@ -22,11 +22,14 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""): handler = lambda p : response[p][board.lower()] result = sorted(players, key=handler, reverse=True)[:10] - counter = 1 message = "" for p in result: - message = message + str(f"**{str(counter):<2} | ") + str(f"{response[p]['username']:<18}:**") + str(f'{str(round(handler(p), 1)):<6}' + f"{str(' ' + board.replace('_', ' '))}\n") + try: + message = message + str(f"**{str(counter):<2} | ") + str(f"{response[p]['username']:<18}:**") + str(f'{str(round(handler(p), 1)):<6}' + f"{str(' ' + board.replace('_', ' '))}\n") + except TypeError: + noname = requests.get(f"https://northstar.tf/accounts/get_username?uid={p}").json() + message = message + str(f"**{str(counter):<2} | ") + str(f"{noname['matches'][0]:<18}:**") + str(f'{str(round(handler(p), 1)):<6}' + f"{str(' ' + board.replace('_', ' '))}\n") counter= counter+1 return message