hot fixed all the bugs introduced
This commit is contained in:
@@ -26,7 +26,7 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""):
|
|||||||
counter = 1
|
counter = 1
|
||||||
message = ""
|
message = ""
|
||||||
for p in result:
|
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
|
counter= counter+1
|
||||||
|
|
||||||
return message
|
return message
|
||||||
@@ -59,7 +59,7 @@ def create_leaderboard_image(board:str, weaponid="", weaponname="", server=""):
|
|||||||
|
|
||||||
def create_leaderboard_message(board:str, weaponid="", weaponname="", server=""):
|
def create_leaderboard_message(board:str, weaponid="", weaponname="", server=""):
|
||||||
#create_leaderboard_image(board, weaponid, weaponname, server)
|
#create_leaderboard_image(board, weaponid, weaponname, server)
|
||||||
message = getLeaderboard(board, weaponid, weaponname, server)
|
message = getleaderboard(board, weaponid, weaponname, server)
|
||||||
if(server == ""):
|
if(server == ""):
|
||||||
server = "all"
|
server = "all"
|
||||||
if(weaponname == ""):
|
if(weaponname == ""):
|
||||||
|
|||||||
+4
-3
@@ -29,10 +29,11 @@ async def get_allplayer_stats(s, playerids, weaponid = "", weaponname= "",server
|
|||||||
img_file = ""
|
img_file = ""
|
||||||
if(len(res) == 1):
|
if(len(res) == 1):
|
||||||
botmessage, img_file = make_donut_chart(botmessage, playerids, server)
|
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 = ""):
|
async def getstats(s, playerid, weaponid = "", server = ""):
|
||||||
payload = {'player': playerid, 'weapon': weaponid, 'server': server}
|
payload = {'player': playerid, 'weapon': weaponid, 'server': server}
|
||||||
async with s.get('https://tone.sleepycat.date/v2/client/players', params=payload) as r:
|
async with s.get('https://tone.sleepycat.date/v2/client/players', params=payload) as r:
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ async def sync(ctx):
|
|||||||
print(f'You synced {str(len(synced))} commands')
|
print(f'You synced {str(len(synced))} commands')
|
||||||
else:
|
else:
|
||||||
await ctx.send("```You must be the botowner to use this command!```")
|
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 def main():
|
||||||
async with client:
|
async with client:
|
||||||
|
|||||||
+1
-1
@@ -35,7 +35,7 @@ class Stats(commands.Cog):
|
|||||||
for item in residue:
|
for item in residue:
|
||||||
if(weaponid == "" and item != None and item != ""):
|
if(weaponid == "" and item != None and item != ""):
|
||||||
weaponid, weaponname = getweaponid(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)
|
server = await getserver(session, item)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ class SlashStats(commands.Cog):
|
|||||||
|
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
players = await get_all_playerids(session, playernames)
|
players = await get_all_playerids(session, playernames)
|
||||||
|
players = players[0]
|
||||||
if(players == {} or players.keys() == []):
|
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(,)```")
|
await interaction.response.send_message("```No existing player given.\nIf you put in multiple players make sure to split them with a comma(,)```")
|
||||||
return
|
return
|
||||||
@@ -43,6 +44,7 @@ class SlashStats(commands.Cog):
|
|||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
botmessage, img_file = await get_allplayer_stats(session, players.values(), weaponid, weaponname, server)
|
botmessage, img_file = await get_allplayer_stats(session, players.values(), weaponid, weaponname, server)
|
||||||
|
|
||||||
|
|
||||||
if(img_file != ""):
|
if(img_file != ""):
|
||||||
await interaction.response.send_message(file=img_file, embed=botmessage)
|
await interaction.response.send_message(file=img_file, embed=botmessage)
|
||||||
else:
|
else:
|
||||||
@@ -71,6 +73,7 @@ class SlashStats(commands.Cog):
|
|||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async def setup(client):
|
async def setup(client):
|
||||||
await client.add_cog(SlashStats(client))
|
await client.add_cog(SlashStats(client))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user