LB is now an img in embed
@@ -1,3 +1,5 @@
|
|||||||
|
import datetime
|
||||||
|
from PIL import Image, ImageDraw, ImageFont
|
||||||
import discord
|
import discord
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
@@ -21,6 +23,42 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""):
|
|||||||
|
|
||||||
result = sorted(players, key=handler, reverse=True)[:10]
|
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")
|
||||||
|
counter= counter+1
|
||||||
|
|
||||||
|
return message
|
||||||
|
|
||||||
|
|
||||||
|
def create_leaderboard_image(board:str, weaponid="", weaponname="", server=""):
|
||||||
|
message = getleaderboard(board, weaponid, weaponname, server)
|
||||||
|
image_width = 600
|
||||||
|
image_height = 300
|
||||||
|
background_color = (43, 45, 49)
|
||||||
|
|
||||||
|
font_size = 24
|
||||||
|
font_color = (255, 255, 255)
|
||||||
|
monospace_font_path = r'C:\Users\larsh\Documents\GitHub\Sonar\Reuse\Fonts\GTAmericaMono.ttf'
|
||||||
|
|
||||||
|
image = Image.new('RGB', (image_width, image_height), background_color)
|
||||||
|
|
||||||
|
font = ImageFont.truetype(monospace_font_path, font_size)
|
||||||
|
|
||||||
|
draw = ImageDraw.Draw(image)
|
||||||
|
|
||||||
|
text_width, text_height = draw.textsize(message, font=font)
|
||||||
|
|
||||||
|
text_x = (image_width - text_width) // 2
|
||||||
|
text_y = (image_height - text_height) // 2
|
||||||
|
|
||||||
|
draw.text((text_x, text_y), message, font=font, fill=font_color)
|
||||||
|
|
||||||
|
image.save('Reuse/images/leaderboard.png')
|
||||||
|
|
||||||
|
def create_leaderboard_message(board:str, weaponid="", weaponname="", server=""):
|
||||||
|
create_leaderboard_image(board, weaponid, weaponname, server)
|
||||||
if(server == ""):
|
if(server == ""):
|
||||||
server = "all"
|
server = "all"
|
||||||
if(weaponname == ""):
|
if(weaponname == ""):
|
||||||
@@ -33,9 +71,11 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""):
|
|||||||
else:
|
else:
|
||||||
botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
|
botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
|
||||||
|
|
||||||
counter = 1
|
date_time = datetime.datetime.utcnow()
|
||||||
for p in result:
|
time = str(date_time)[11:16]
|
||||||
botmessage.add_field(name="", value=str(str(f"**{str(counter):<2} |** " + f"**{response[p]['username']}" + ":** ") + f'{str(round(handler(p), 1))}' + f"{str(' ' + board.replace('_', ' '))}"), inline=False)
|
date = str(date_time)[0:10]
|
||||||
counter= counter+1
|
img_file = discord.File("Reuse/images/leaderboard.png", filename="leaderboard.png")
|
||||||
|
botmessage.set_image(url="attachment://leaderboard.png")
|
||||||
|
botmessage.set_footer(text=f"Brought to you by ToneAPI, created at {date} on {time}")
|
||||||
|
|
||||||
return botmessage
|
return botmessage, img_file
|
||||||
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
@@ -2,7 +2,7 @@ import aiohttp
|
|||||||
import discord
|
import discord
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
import requests
|
import requests
|
||||||
from Reuse.getLeaderboard import getleaderboard
|
from Reuse.getLeaderboard import create_leaderboard_message
|
||||||
from Reuse.getServer import getserver
|
from Reuse.getServer import getserver
|
||||||
|
|
||||||
from Reuse.getWeapon import getweaponid
|
from Reuse.getWeapon import getweaponid
|
||||||
@@ -53,10 +53,9 @@ class Leaderboard(commands.Cog):
|
|||||||
botmessage = botmessage + "\n*Note you need to split filters with comma's(,)"
|
botmessage = botmessage + "\n*Note you need to split filters with comma's(,)"
|
||||||
await ctx.send(f"```{botmessage}```")
|
await ctx.send(f"```{botmessage}```")
|
||||||
|
|
||||||
|
botmessage, img_file = create_leaderboard_message(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
|
||||||
|
|
||||||
botmessage = getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
|
await ctx.send(file=img_file, embed=botmessage)
|
||||||
|
|
||||||
await ctx.send(embed=botmessage)
|
|
||||||
|
|
||||||
|
|
||||||
async def setup(client):
|
async def setup(client):
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import discord
|
|||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
from discord import app_commands
|
from discord import app_commands
|
||||||
import requests
|
import requests
|
||||||
from Reuse.getLeaderboard import getleaderboard
|
from Reuse.getLeaderboard import create_leaderboard_message, getleaderboard
|
||||||
|
|
||||||
from Reuse.getServer import getserver
|
from Reuse.getServer import getserver
|
||||||
from Reuse.getWeapon import getweaponid
|
from Reuse.getWeapon import getweaponid
|
||||||
@@ -31,17 +31,17 @@ class SlashLeaderboard(commands.Cog):
|
|||||||
server = getserver(session,servername)
|
server = getserver(session,servername)
|
||||||
|
|
||||||
if(board in boards):
|
if(board in boards):
|
||||||
botmessage = getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
|
botmessage, img_file = create_leaderboard_message(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
|
||||||
else:
|
else:
|
||||||
botmessage = "You gave a none existing filter"
|
botmessage = "You gave a none existing filter"
|
||||||
|
|
||||||
await interaction.response.send_message(f'```{botmessage}```')
|
await interaction.response.send_message(file=img_file, embed=botmessage)
|
||||||
|
|
||||||
|
|
||||||
@leaderboard.autocomplete("weapon")
|
@leaderboard.autocomplete("weapon")
|
||||||
async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
|
async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
|
||||||
data = []
|
data = []
|
||||||
weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'masstiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift']
|
weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift']
|
||||||
for weapon_choice in weaponlist:
|
for weapon_choice in weaponlist:
|
||||||
if(current.lower() in weapon_choice.lower()):
|
if(current.lower() in weapon_choice.lower()):
|
||||||
data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))
|
data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class SlashStats(commands.Cog):
|
|||||||
@stats.autocomplete("weapon")
|
@stats.autocomplete("weapon")
|
||||||
async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
|
async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
|
||||||
data = []
|
data = []
|
||||||
weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'masstiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift']
|
weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift']
|
||||||
for weapon_choice in weaponlist:
|
for weapon_choice in weaponlist:
|
||||||
if(current.lower() in weapon_choice.lower()):
|
if(current.lower() in weapon_choice.lower()):
|
||||||
data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))
|
data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))
|
||||||
|
|||||||