From e2d49cf1f3599bf4eca87176ea77f0b488d1546a Mon Sep 17 00:00:00 2001 From: iiLarsH Date: Fri, 9 Jun 2023 16:59:27 +0200 Subject: [PATCH] hot fixed all the bugs introduced --- Reuse/getLeaderboard.py | 4 ++-- Reuse/getStats.py | 7 ++++--- bot.py | 4 ++++ cogs/stats.py | 2 +- slashcogs/slashstats.py | 3 +++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Reuse/getLeaderboard.py b/Reuse/getLeaderboard.py index c5a3a05..d872c59 100644 --- a/Reuse/getLeaderboard.py +++ b/Reuse/getLeaderboard.py @@ -26,7 +26,7 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""): 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") + 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") counter= counter+1 return message @@ -59,7 +59,7 @@ def create_leaderboard_image(board:str, weaponid="", weaponname="", server=""): def create_leaderboard_message(board:str, weaponid="", weaponname="", server=""): #create_leaderboard_image(board, weaponid, weaponname, server) - message = getLeaderboard(board, weaponid, weaponname, server) + message = getleaderboard(board, weaponid, weaponname, server) if(server == ""): server = "all" if(weaponname == ""): diff --git a/Reuse/getStats.py b/Reuse/getStats.py index 33d8fb5..05195a5 100644 --- a/Reuse/getStats.py +++ b/Reuse/getStats.py @@ -29,10 +29,11 @@ async def get_allplayer_stats(s, playerids, weaponid = "", weaponname= "",server img_file = "" if(len(res) == 1): botmessage, img_file = make_donut_chart(botmessage, playerids, server) - + return botmessage, img_file + else: + img_file = "" + return botmessage, img_file - return botmessage, img_file - async def getstats(s, playerid, weaponid = "", server = ""): payload = {'player': playerid, 'weapon': weaponid, 'server': server} async with s.get('https://tone.sleepycat.date/v2/client/players', params=payload) as r: diff --git a/bot.py b/bot.py index 450cf35..2d28d7a 100644 --- a/bot.py +++ b/bot.py @@ -29,6 +29,10 @@ async def sync(ctx): print(f'You synced {str(len(synced))} commands') else: await ctx.send("```You must be the botowner to use this command!```") + +@client.tree.error +async def on_app_command_error(interaction, error): + print(f"{error}") async def main(): async with client: diff --git a/cogs/stats.py b/cogs/stats.py index ddb83f6..e6176ce 100644 --- a/cogs/stats.py +++ b/cogs/stats.py @@ -35,7 +35,7 @@ class Stats(commands.Cog): for item in residue: if(weaponid == "" and item != None and item != ""): weaponid, weaponname = getweaponid(item) - if(server == "" and item != None and item != "" and item != weaponname): + if(server == "" and item != None and item != "" and item not in weaponname): server = await getserver(session, item) diff --git a/slashcogs/slashstats.py b/slashcogs/slashstats.py index ebe9ca1..410bb68 100644 --- a/slashcogs/slashstats.py +++ b/slashcogs/slashstats.py @@ -31,6 +31,7 @@ class SlashStats(commands.Cog): async with aiohttp.ClientSession() as session: players = await get_all_playerids(session, playernames) + players = players[0] if(players == {} or players.keys() == []): await interaction.response.send_message("```No existing player given.\nIf you put in multiple players make sure to split them with a comma(,)```") return @@ -43,6 +44,7 @@ class SlashStats(commands.Cog): async with aiohttp.ClientSession() as session: botmessage, img_file = await get_allplayer_stats(session, players.values(), weaponid, weaponname, server) + if(img_file != ""): await interaction.response.send_message(file=img_file, embed=botmessage) else: @@ -71,6 +73,7 @@ class SlashStats(commands.Cog): return data + async def setup(client): await client.add_cog(SlashStats(client))