Merge pull request #18 from ToneAPI/Development

Development
2023-06-05 21:13:09 +02:00
parent 835994a8b4 e9f0c040d4
commit 5273541f2c
59 changed files with 412 additions and 651 deletions
@@ -0,0 +1,81 @@
+import datetime
+from PIL import Image, ImageDraw, ImageFont
+import discord
+import requests
+
+def getleaderboard(board:str, weaponid="", weaponname="", server=""):
+    payload = {"weapon": weaponid, "server": server}
+    response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json()
+    players = response.keys()
+    if(board.lower() == "totald"):
+        board = "total_distance"
+    elif(board.lower() == "maxd"):
+        board = "max_distance"
+        
+    if(board.lower() == "kd"):
+        handler = lambda p : response[p]['kills'] / max(response[p]["deaths"], 1)
+    elif(board.lower() == "avgd"):
+        handler = lambda p : response[p]['total_distance'] / max(response[p]["kills"], 1)
+    else:
+        if(board.lower() not in ['username', 'deaths','kills', 'max_distance','total_distance']):
+            raise KeyError("Key " + board.lower() + ' not found for player leaderboard')
+        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")
+        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 == ""):
+        server = "all"
+    if(weaponname == ""):
+        weaponname = "any"
+
+    botmessage = discord.Embed(title=f"Leaderboard of {board}", description=f"**Server:** {server}\n**Weapon:** {weaponname}", colour=discord.Colour.orange())    
+    if(weaponname != "any"):
+        if(requests.head(f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png").status_code == 200):
+            botmessage.set_thumbnail(url=f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png")
+        else:
+            botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
+
+    date_time = datetime.datetime.utcnow()
+    time = str(date_time)[11:16]
+    date = str(date_time)[0:10]
+    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, img_file
@@ -0,0 +1,33 @@
+import asyncio
+
+async def get_all_playerids(s, playernames):
+     players = {}
+     residue = []
+     tasks = []
+     for playername in playernames:
+          task = asyncio.create_task(getplayerid(s, playername),name=playername)
+          tasks.append(task)
+     res = await asyncio.gather(*tasks)
+     for player in res:
+           player = player.split(":")
+           playername = player[0].strip()
+           playerid = player[1].strip()
+           if(playerid != "None" and playername not in players):
+                players[playername] = playerid
+           else:
+                residue.append(playername) 
+     return players, residue
+
+async def getplayerid(s,playername):
+        playerid = ""
+        playername = playername.replace(",", "")
+        payload = str(f"?username={playername}")
+        async with s.get(f'https://northstar.tf/accounts/lookup_uid{payload}') as r:
+                
+                response = await r.json()
+                if (response['matches'] != None and response['matches'] != []):
+                    playerid = response['matches'][0]
+                    player = str(f"{playername.lower()}: {playerid}")
+                else:
+                    player = str(f"{playername.lower()}: {None}")
+                return player
@@ -0,0 +1,13 @@
+async def getserver(s,snippet):
+    server = ""
+    async with s.get('https://tone.sleepycat.date/v2/client/servers') as r:
+        response = await r.json()
+        servers = response.keys()
+        for i in servers:
+            if(snippet.lower().replace(" ", "") == i.lower().replace(" ", "")):
+                server = i
+                break
+            elif(snippet.lower().replace(" ", "") in i.lower().replace(" ", "")):
+                 server = i
+
+        return server
@@ -0,0 +1,65 @@
+import asyncio
+
+import discord
+import requests
+
+from Reuse.makePiechart import make_donut_chart
+
+async def get_allplayer_stats(s, playerids, weaponid = "", weaponname= "",server = ""):
+        tasks = []
+        for playerid in playerids:
+            task = asyncio.create_task(getstats(s, playerid, weaponid, server), name=playerid)
+            tasks.append(task)
+        res = await asyncio.gather(*tasks)
+        if(server == ""):
+            server = "All"
+        if(weaponname == ""):
+            weaponname = "Any"
+
+        botmessage = discord.Embed(title="Stats", description=f"**Server:** {server}\n**Weapon:** {weaponname}", colour=discord.Colour.orange())
+        if(weaponname != "Any"):
+            if(requests.head(f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png").status_code == 200):
+                botmessage.set_thumbnail(url=f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png")
+            else:
+                botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
+            
+        for stats in res:
+            botmessage.add_field(name=f"Stats for {stats['Player']}", value=stats['message'])
+
+        img_file = ""
+        if(len(res) == 1):
+            botmessage, img_file = make_donut_chart(botmessage, playerids, server)
+            
+        
+        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:
+            response = await r.json()
+            if(response == {}):
+                async with s.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}) as Er:
+                    errorresponse = await Er.json()
+                    if(errorresponse['matches'] != None):
+                        playername = errorresponse['matches'][0]
+                        stats = {"Player": playername, "message": "No stats found for this player."}
+                        return stats
+        
+            killstats = response[str(playerid)]
+
+            botmessage = str("Kills: " + str(killstats['kills']) + '\n' )
+              
+            if(weaponid != ""):
+                deaths=killstats['deaths_while_equipped']
+                if(deaths == 0):
+                    deaths = 1;
+                botmessage += str(str("Deaths: " + str(killstats['deaths_while_equipped'])) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))+ '\n' + str("Deaths to: " + str(killstats['deaths']))))
+            else:
+                deaths=killstats['deaths']
+                if(deaths == 0):
+                    deaths = 1;
+                botmessage = botmessage + str("Deaths: " + str(killstats['deaths'])) + '\n' + str("KD: " + str("{:0.2f}".format(killstats['kills']/deaths)))
+
+        stats = {"Player": killstats['username'], "message": botmessage}
+        
+        return stats
@@ -0,0 +1,58 @@
+def getweaponid(givenweapon):
+        weapons ={
+                    "execution": "human_execution", 
+                    "car": "mp_weapon_car",
+                    "charge rifle": "mp_weapon_defender",
+                    "double take": "mp_weapon_doubletake",
+                    "epg": "mp_weapon_epg",
+                    "volt": "mp_weapon_hemlok_smg",
+                    "lstar": "mp_weapon_lstar",
+                    "r97": "mp_weapon_r97",
+                    "r-201": "mp_weapon_rspn101",
+                    "smart pistol": "mp_weapon_smart_pistol",
+                    "kraber": "mp_weapon_sniper",
+                    "flatline": "mp_weapon_vinson",
+                    "re-45 auto": "mp_weapon_autopistol",
+                    "alternator": "mp_weapon_alternator_smg",
+                    "frag grenade": "mp_weapon_frag_grenade",
+                    "g2": "mp_weapon_g2",
+                    "spitfire": "mp_weapon_lmg",
+                    "smr": "mp_weapon_smr",
+                    "softball": "mp_weapon_softball",
+                    "firestar": "mp_weapon_thermite_grenade",
+                    "melee": "melee_pilot_emptyhanded",
+                    "mastiff": "mp_weapon_mastiff",
+                    "mgl": "mp_weapon_mgl",
+                    "r-101": "mp_weapon_rspn101_og",
+                    "wingman": "mp_weapon_wingman",
+                    "invalid": "invalid",
+                    "thunderbolt": "mp_weapon_arc_launcher",
+                    "dmr": "mp_weapon_dmr",
+                    "electric smoke": "mp_weapon_grenade_electric_smoke",
+                    "cold war": "mp_weapon_pulse_lmg",
+                    "satchel": "mp_weapon_satchel",
+                    "eva-8 auto": "mp_weapon_shotgun",
+                    "mozambique": "mp_weapon_shotgun_pistol",
+                    "wingman elite": "mp_weapon_wingman_n",
+                    "gravity star": "mp_weapon_grenade_gravity",
+                    "pulse blade": "mp_weapon_grenade_sonar",
+                    "archer": "mp_weapon_rocket_launcher",
+                    "outOfBounds": "outOfBounds",
+                    "mind crime": "mind_crime",
+                    "devotion": "mp_weapon_esaw",
+                    "fall": "fall",
+                    "p2016": "mp_weapon_semipistol",
+                    "arc grenade": "mp_weapon_grenade_emp",
+                    "hemlok": "mp_weapon_hemlok",
+                    "phase shift": "phase_shift"
+                }
+    
+        weaponid = ""
+        weaponname = ""
+        for weapon in weapons:     
+            if(givenweapon.lower().replace(" ", "") in weapon.lower().replace(" ", "")):     
+                weaponid = weapons[weapon]
+                weaponname = weapon
+                break
+
+        return weaponid, weaponname
@@ -0,0 +1,99 @@
+import discord
+import matplotlib.pyplot as plt
+import numpy as np
+import requests
+
+def make_donut_chart(botmessage, playerid, server=""):
+    plt.figure().clear()
+    weapon = {
+    "human_execution": "execution",
+    "mp_weapon_car": "car",
+    "mp_weapon_defender": "charge rifle",
+    "mp_weapon_doubletake": "double take",
+    "mp_weapon_epg": "epg",
+    "mp_weapon_hemlok_smg": "volt",
+    "mp_weapon_lstar": "lstar",
+    "mp_weapon_r97": "r97",
+    "mp_weapon_rspn101": "r-201",
+    "mp_weapon_smart_pistol": "smart pistol",
+    "mp_weapon_sniper": "kraber",
+    "mp_weapon_vinson": "flatline",
+    "mp_weapon_autopistol": "re-45 auto",
+    "mp_weapon_alternator_smg": "alternator",
+    "mp_weapon_frag_grenade": "frag grenade",
+    "mp_weapon_g2": "g2",
+    "mp_weapon_lmg": "spitfire",
+    "mp_weapon_smr": "smr",
+    "mp_weapon_softball": "softball",
+    "mp_weapon_thermite_grenade": "firestar",
+    "melee_pilot_emptyhanded": "melee",
+    "mp_weapon_mastiff": "mastiff",
+    "mp_weapon_mgl": "mgl",
+    "mp_weapon_rspn101_og": "r-101",
+    "mp_weapon_wingman": "wingman",
+    "invalid": "invalid",
+    "mp_weapon_arc_launcher": "thunderbolt",
+    "mp_weapon_dmr": "dmr",
+    "mp_weapon_grenade_electric_smoke": "electric smoke",
+    "mp_weapon_pulse_lmg": "cold war",
+    "mp_weapon_satchel": "satchel",
+    "mp_weapon_shotgun": "eva-8 auto",
+    "mp_weapon_shotgun_pistol": "mozambique",
+    "mp_weapon_wingman_n": "wingman elite",
+    "mp_weapon_grenade_gravity": "gravity star",
+    "mp_weapon_grenade_sonar": "pulse blade",
+    "mp_weapon_rocket_launcher": "archer",
+    "outOfBounds": "outOfBounds",
+    "mind_crime": "mind crime",
+    "mp_weapon_esaw": "devotion",
+    "fall": "fall",
+    "mp_weapon_semipistol": "p2016",
+    "mp_weapon_grenade_emp": "arc grenade",
+    "mp_weapon_hemlok": "hemlok",
+    "phase_shift": "phase shift"
+    }
+
+    if(server != "All"):
+        payload = {'player': playerid, 'server': server}
+    else:
+        payload = {'player': playerid}
+
+    response = requests.get('https://tone.sleepycat.date/v2/client/weapons', params=payload).json()
+
+    labels = []
+    values = []
+    total = 0
+    dict_weapon_with_kills = {}
+    for i in response.keys():
+        weaponstats = response[i]
+        dict_weapon_with_kills[i] = weaponstats['kills']
+        total += weaponstats['kills']
+
+    other = 0
+    for j in dict_weapon_with_kills:
+        if(dict_weapon_with_kills[j] > total/20):
+            try:
+                labels.append(weapon[j])
+            except KeyError:
+                labels.append(j)
+            values.append(dict_weapon_with_kills[j])
+        else:
+            other += dict_weapon_with_kills[j]
+
+    labels.append("other")
+    values.append(other)
+
+    plt.style.use('ggplot')
+    plt.title("weapons used by player")
+    plt.pie(x=values, autopct='%.0f%%', startangle=90)
+    plt.axis('equal')
+    plt.legend(title="weapons" ,labels=labels, loc='upper left', bbox_to_anchor=(-0.17, 0.67, 0.5, 0.5))
+
+    circle = plt.Circle(xy=(0,0), radius=.1, facecolor='white')
+    plt.gca().add_artist(circle)
+
+    plt.savefig("Reuse/images/player_weapons_used.png")
+    img_file = discord.File("Reuse/images/player_weapons_used.png", filename="player_weapons_used.png")
+    botmessage.set_image(url="attachment://player_weapons_used.png")
+
+    return botmessage, img_file
@@ -28,7 +28,7 @@ async def sync(ctx):
        synced = await client.tree.sync()
        print(f'You synced {str(len(synced))} commands')
    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!```")
                                        
 async def main():
    async with client:
@@ -1,6 +1,11 @@
+import aiohttp
 import discord
 from discord.ext import commands
 import requests
+from Reuse.getLeaderboard import create_leaderboard_message
+from Reuse.getServer import getserver
+
+from Reuse.getWeapon import getweaponid

 class Leaderboard(commands.Cog):
    def __init__(self, client):
@@ -15,11 +20,9 @@ class Leaderboard(commands.Cog):
        boards = ["kd", "avgd", "maxd", "totald","deaths", "kills"]
        error = False
        board = ""
-        servers = []
        server = ""
        weaponid= ""
        weaponname= ""
-
        if(message == ()):
            error = True
            botmessage = "No leaderboard option selected, choose from:\n"
@@ -30,20 +33,16 @@ class Leaderboard(commands.Cog):
        message = list(message)
        message = "".join(message)
        message = message.split(",")
+        async with aiohttp.ClientSession() as session:
+            for item in message:
+                if(item.lower() in boards):
+                    board = item;
+                else:
+                    if(item != None and item != "" and weaponid == ""):
+                        weaponid, weaponname = getweaponid(item)
+                    if(item != None and item != ""  and server == "" and item != weaponname):
+                        server = await getserver(session, item)

-        print(message)
-
-        for i in message:
-            item = i.strip()
-            if(item.lower() not in boards):
-                function_dict = self.message_handler(item)
-                if(function_dict['weapon'] != None):
-                    weaponname = function_dict["weapon"][1]
-                    weaponid= function_dict['weapon'][0]
-                if(function_dict['server'] != None):
-                    servers.append(function_dict['server'])
-            else:
-                board = item 

        if(board == "" and error == False):
            error = True
@@ -54,149 +53,10 @@ class Leaderboard(commands.Cog):
            botmessage = botmessage + "\n*Note you need to split filters with comma's(,)"
            await ctx.send(f"```{botmessage}```")

-        servers.append(self.getserver("", " ".join(message)))
-        server = ""
-        if(len(servers) > 1):   
-            for i in servers:
-                if(i.lower() in " ".join(message).lower()):
-                    server = i
-                    break   
-                else:
-                    server = servers[0]
+        botmessage, img_file = create_leaderboard_message(weaponid=weaponid, weaponname=weaponname, server=server, board=board)

-        botmessage = self.getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
+        await ctx.send(file=img_file, embed=botmessage)

-        await ctx.send(f'```{botmessage}```')
-
-    def message_handler(self, message):
-        weapon = False
-        server = False
-        return_message = {"weapon": None, "server": None}
-
-        weaponid, weaponname = self.getweaponid(message)
-        if(weaponid != ""):
-            weapon = True
-
-        servername = self.getserver(message)
-        if(servername != ""):
-            server = True
-
-        if(server):
-            return_message["server"] = servername
-        if(weapon):
-            return_message["weapon"] = [weaponid, weaponname]
-
-        return return_message
-
-    def getweaponid(self, weaponname):
-        weapons ={
-                    "execution": "human_execution", 
-                    "car": "mp_weapon_car",
-                    "charge rifle": "mp_weapon_defender",
-                    "double take": "mp_weapon_doubletake",
-                    "epg": "mp_weapon_epg",
-                    "volt": "mp_weapon_hemlok_smg",
-                    "lstar": "mp_weapon_lstar",
-                    "r97": "mp_weapon_r97",
-                    "r-201": "mp_weapon_rspn101",
-                    "smart pistol": "mp_weapon_smart_pistol",
-                    "kraber": "mp_weapon_sniper",
-                    "flatline": "mp_weapon_vinson",
-                    "re-45 auto": "mp_weapon_autopistol",
-                    "alternator": "mp_weapon_alternator_smg",
-                    "frag grenade": "mp_weapon_frag_grenade",
-                    "g2": "mp_weapon_g2",
-                    "spitfire": "mp_weapon_lmg",
-                    "smr": "mp_weapon_smr",
-                    "softball": "mp_weapon_softball",
-                    "firestar": "mp_weapon_thermite_grenade",
-                    "melee": "melee_pilot_emptyhanded",
-                    "masstiff": "mp_weapon_mastiff",
-                    "mgl": "mp_weapon_mgl",
-                    "r-101": "mp_weapon_rspn101_og",
-                    "wingman": "mp_weapon_wingman",
-                    "invalid": "invalid",
-                    "thunderbolt": "mp_weapon_arc_launcher",
-                    "dmr": "mp_weapon_dmr",
-                    "electric smoke": "mp_weapon_grenade_electric_smoke",
-                    "cold war": "mp_weapon_pulse_lmg",
-                    "satchel": "mp_weapon_satchel",
-                    "eva-8 auto": "mp_weapon_shotgun",
-                    "mozambique": "mp_weapon_shotgun_pistol",
-                    "wingman elite": "mp_weapon_wingman_n",
-                    "gravity star": "mp_weapon_grenade_gravity",
-                    "pulse blade": "mp_weapon_grenade_sonar",
-                    "archer": "mp_weapon_rocket_launcher",
-                    "outOfBounds": "outOfBounds",
-                    "mind crime": "mind_crime",
-                    "devotion": "mp_weapon_esaw",
-                    "fall": "fall",
-                    "p2016": "mp_weapon_semipistol",
-                    "arc grenade": "mp_weapon_grenade_emp",
-                    "hemlok": "mp_weapon_hemlok",
-                    "phase shift": "phase_shift"
-                }
-    
-        weaponid = ""
-        for weapon in weapons:     
-            if(weaponname.lower() in weapon.lower()):     
-                weaponid = weapons[weapon]
-                weaponname = weapon
-                break
-
-        return weaponid, weaponname
-
-    def getserver(self, snippet, fullmessage = ""):
-        server = ""
-        response = requests.get('https://tone.sleepycat.date/v2/client/servers').json()
-        servers = response.keys()
-
-        for i in servers:
-            if(snippet.lower() in i.lower().replace(" ", "")):
-                server = i
-            if(i.lower() in fullmessage.lower().replace(" ", "")):
-                server = i
-                break
-
-        return server
-    
-    def getleaderboard(self, board:str, weaponid="", weaponname="", server=""):
-        payload = {"weapon": weaponid, "server": server}
-        response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json()
-        players = response.keys()
-        if(board.lower() == "totald"):
-            board = "total_distance"
-        elif(board.lower() == "maxd"):
-            board = "max_distance"
-        
-        if(board.lower() == "kd"):
-            handler = lambda p : response[p]['kills'] / max(response[p].deaths, 1)
-        elif(board.lower() == "avgd"):
-            handler = lambda p : response[p]['total_distance'] / max(response[p].kills, 1)
-        else:
-            if(board.lower() not in ['username', 'deaths','kills', 'max_distance','total_distance']):
-                raise Exception("Key " + board.lower() + ' not found for player leaderboard')
-            handler = lambda p : response[p][board.lower()]
-            
-        result = sorted(players, key=handler, reverse=True)[:10]
-
-        if(board.lower() == "deaths"):
-            inbetween = "to"
-        else:
-            inbetween = "with"
-
-        if(server == ""):
-            server = "all servers"
-        if(weaponname == ""):
-            weaponname = "any weapon"
-
-        botmessage = str(f"Leaderboard of {board} {inbetween} {weaponname} for {server}\n-------------------------------\n")
-
-        counter = 1
-        for p in result:
-            botmessage = botmessage + str(f"{str(counter):<2}"+ " - " + f"{response[p]['username'] :<20}" + " : "+ f"{str(handler(p)):<8}" + "\n")
-            counter= counter+1 
-        return botmessage

 async def setup(client):
    await client.add_cog(Leaderboard(client))
@@ -1,9 +1,9 @@
-import asyncio
-from urllib import request
 import aiohttp
-import discord
 from discord.ext import commands
-import requests
+from Reuse.getPlayer import get_all_playerids
+from Reuse.getServer import getserver
+from Reuse.getStats import get_allplayer_stats
+from Reuse.getWeapon import getweaponid

 class Stats(commands.Cog):
    def __init__(self, client):
@@ -30,13 +30,13 @@ class Stats(commands.Cog):
        message = message.split(",")

        async with aiohttp.ClientSession() as session:
-            players, residue = await self.get_all_playerids(session, message)
+            players, residue = await get_all_playerids(session, message)

            for item in residue:
-                if(server == "" and item != None and item != ""):
-                    server = await self.getserver(item)
                if(weaponid == "" and item != None and item != ""):
-                    weaponid, weaponname = self.getweaponid(item)
+                    weaponid, weaponname = getweaponid(item)
+                if(server == "" and item != None and item != "" and item != weaponname):
+                    server = await getserver(session, item)
            

        if(len(players.values()) == 0 and error == False):
@@ -45,173 +45,16 @@ class Stats(commands.Cog):
            return

        async with aiohttp.ClientSession() as session:
-            botmessage = await self.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 != ""):
+            await ctx.send(file=img_file, embed=botmessage)
+        else:
+            await ctx.send(embed=botmessage)

-        await ctx.send(embed=botmessage)
-
-
-    async def get_all_playerids(self, s, playernames):
-     players = {}
-     residue = []
-     tasks = []
-     for playername in playernames:
-          task = asyncio.create_task(self.getplayerid(s, playername),name=playername)
-          tasks.append(task)
-     res = await asyncio.gather(*tasks)
-     for player in res:
-           player = player.split(":")
-           playername = player[0].strip()
-           playerid = player[1].strip()
-           if(playerid != "None" and playername not in players):
-                players[playername] = playerid
-           else:
-                residue.append(playername) 
-     return players, residue
-
-    async def getplayerid(self,s,playername):
-        playerid = ""
-        playername = playername.replace(",", "")
-        payload = str(f"?username={playername}")
-        async with s.get(f'https://northstar.tf/accounts/lookup_uid{payload}') as r:
-                
-                response = await r.json()
-                if (response['matches'] != None and response['matches'] != []):
-                    playerid = response['matches'][0]
-                    player = str(f"{playername.lower()}: {playerid}")
-                else:
-                    player = str(f"{playername.lower()}: {None}")
-                return player
-        
-    def getweaponid(self,givenweapon):
-        weapons ={
-                    "execution": "human_execution", 
-                    "car": "mp_weapon_car",
-                    "charge rifle": "mp_weapon_defender",
-                    "double take": "mp_weapon_doubletake",
-                    "epg": "mp_weapon_epg",
-                    "volt": "mp_weapon_hemlok_smg",
-                    "lstar": "mp_weapon_lstar",
-                    "r97": "mp_weapon_r97",
-                    "r-201": "mp_weapon_rspn101",
-                    "smart pistol": "mp_weapon_smart_pistol",
-                    "kraber": "mp_weapon_sniper",
-                    "flatline": "mp_weapon_vinson",
-                    "re-45 auto": "mp_weapon_autopistol",
-                    "alternator": "mp_weapon_alternator_smg",
-                    "frag grenade": "mp_weapon_frag_grenade",
-                    "g2": "mp_weapon_g2",
-                    "spitfire": "mp_weapon_lmg",
-                    "smr": "mp_weapon_smr",
-                    "softball": "mp_weapon_softball",
-                    "firestar": "mp_weapon_thermite_grenade",
-                    "melee": "melee_pilot_emptyhanded",
-                    "mastiff": "mp_weapon_mastiff",
-                    "mgl": "mp_weapon_mgl",
-                    "r-101": "mp_weapon_rspn101_og",
-                    "wingman": "mp_weapon_wingman",
-                    "invalid": "invalid",
-                    "thunderbolt": "mp_weapon_arc_launcher",
-                    "dmr": "mp_weapon_dmr",
-                    "electric smoke": "mp_weapon_grenade_electric_smoke",
-                    "cold war": "mp_weapon_pulse_lmg",
-                    "satchel": "mp_weapon_satchel",
-                    "eva-8 auto": "mp_weapon_shotgun",
-                    "mozambique": "mp_weapon_shotgun_pistol",
-                    "wingman elite": "mp_weapon_wingman_n",
-                    "gravity star": "mp_weapon_grenade_gravity",
-                    "pulse blade": "mp_weapon_grenade_sonar",
-                    "archer": "mp_weapon_rocket_launcher",
-                    "outOfBounds": "outOfBounds",
-                    "mind crime": "mind_crime",
-                    "devotion": "mp_weapon_esaw",
-                    "fall": "fall",
-                    "p2016": "mp_weapon_semipistol",
-                    "arc grenade": "mp_weapon_grenade_emp",
-                    "hemlok": "mp_weapon_hemlok",
-                    "phase shift": "phase_shift"
-                }
-    
-        weaponid = ""
-        weaponname = ""
-        for weapon in weapons:     
-            if(givenweapon.lower() in weapon.lower()):     
-                weaponid = weapons[weapon]
-                weaponname = weapon
-                break
-
-        return weaponid, weaponname
-
-    async def getserver(self, snippet):
-        server = ""
-        async with aiohttp.ClientSession() as session:
-            async with session.get('https://tone.sleepycat.date/v2/client/servers') as r:
-                response = await r.json()
-                servers = response.keys()
-        for i in servers:
-            if(snippet.lower() == i.lower().replace(" ", "")):
-                server = i
-                break
-            elif(snippet.lower() in i.lower().replace(" ", "")):
-                 server = i
-
-        return server
-
-    async def get_allplayer_stats(self, s, playerids, weaponid = "", weaponname= "",server = ""):
-        tasks = []
-        for playerid in playerids:
-            task = asyncio.create_task(self.getstats(s, playerid, weaponid, server), name=playerid)
-            tasks.append(task)
-        res = await asyncio.gather(*tasks)
-        if(server == ""):
-            server = "All"
-        if(weaponname == ""):
-            weaponname = "Any"
-
-        botmessage = discord.Embed(title="Stats", description=f"**Server:** {server}\n**Weapon:** {weaponname}", colour=discord.Colour.orange())
-        if(weaponname != "Any"):
-            if(requests.head(f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png").status_code == 200):
-                botmessage.set_thumbnail(url=f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png")
-            else:
-                botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
-
-        for stats in res:
-            botmessage.add_field(name=f"Stats for {stats['Player']}", value=stats['message'])
-            
-        return botmessage
-
-    async def getstats(self, 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:
-            response = await r.json()
-            if(response == {}):
-                async with s.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}) as Er:
-                    errorresponse = await Er.json()
-                    if(errorresponse['matches'] != None):
-                        playername = errorresponse['matches'][0]
-                        stats = {"Player": playername, "message": "No stats found for this player."}
-                        return stats
-        
-            killstats = response[str(playerid)]
-
-            botmessage = str("Kills: " + str(killstats['kills']) + '\n' )
-              
-            if(weaponid != ""):
-                deaths=killstats['deaths_while_equipped']
-                if(deaths == 0):
-                    deaths = 1;
-                botmessage += str(str("Deaths: " + str(killstats['deaths_while_equipped'])) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))+ '\n' + str("Deaths to: " + str(killstats['deaths']))))
-            else:
-                deaths=killstats['deaths']
-                if(deaths == 0):
-                    deaths = 1;
-                botmessage = botmessage + str("Deaths: " + str(killstats['deaths'])) + '\n' + str("KD: " + str("{:0.2f}".format(killstats['kills']/deaths)))
-
-        stats = {"Player": killstats['username'], "message": botmessage}
-        
-        return stats
-    
-
+    @commands.Cog.listener()
+    async def on_command_error(self, ctx, err):
+        print(err)

 async def setup(client):
    await client.add_cog(Stats(client))
@@ -1,7 +1,12 @@
+import aiohttp
 import discord
 from discord.ext import commands
 from discord import app_commands
 import requests
+from Reuse.getLeaderboard import create_leaderboard_message, getleaderboard
+
+from Reuse.getServer import getserver
+from Reuse.getWeapon import getweaponid

 class SlashLeaderboard(commands.Cog):
    def __init__(self, client):
@@ -19,171 +24,24 @@ class SlashLeaderboard(commands.Cog):
        server = ""
        weaponid= ""
        weaponname= ""
+        async with aiohttp.ClientSession() as session:
+            if(weapon != ""):
+                weaponid, weaponname = getweaponid(weapon)
+            if(servername != ""):
+                server = getserver(session,servername)

-        if(weapon != ""):
-            weaponid, weaponname = self.getweaponid(weapon)
-        if(servername != ""):
-            server = self.getserver(servername)
+            if(board in boards):
+                botmessage, img_file = create_leaderboard_message(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
+            else:
+                botmessage = "You gave a none existing filter"

-        if(board in boards):
-            botmessage = self.getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
-        else:
-            botmessage = "You gave a none existing filter"
+        await interaction.response.send_message(file=img_file, embed=botmessage)

-        await interaction.response.send_message(f'```{botmessage}```')
-
-    def getweaponid(self, weaponname):
-        weapons ={
-                    "execution": "human_execution", 
-                    "car": "mp_weapon_car",
-                    "charge rifle": "mp_weapon_defender",
-                    "double take": "mp_weapon_doubletake",
-                    "epg": "mp_weapon_epg",
-                    "volt": "mp_weapon_hemlok_smg",
-                    "lstar": "mp_weapon_lstar",
-                    "r97": "mp_weapon_r97",
-                    "r-201": "mp_weapon_rspn101",
-                    "smart pistol": "mp_weapon_smart_pistol",
-                    "kraber": "mp_weapon_sniper",
-                    "flatline": "mp_weapon_vinson",
-                    "re-45 auto": "mp_weapon_autopistol",
-                    "alternator": "mp_weapon_alternator_smg",
-                    "frag grenade": "mp_weapon_frag_grenade",
-                    "g2": "mp_weapon_g2",
-                    "spitfire": "mp_weapon_lmg",
-                    "smr": "mp_weapon_smr",
-                    "softball": "mp_weapon_softball",
-                    "firestar": "mp_weapon_thermite_grenade",
-                    "melee": "melee_pilot_emptyhanded",
-                    "masstiff": "mp_weapon_mastiff",
-                    "mgl": "mp_weapon_mgl",
-                    "r-101": "mp_weapon_rspn101_og",
-                    "wingman": "mp_weapon_wingman",
-                    "invalid": "invalid",
-                    "thunderbolt": "mp_weapon_arc_launcher",
-                    "dmr": "mp_weapon_dmr",
-                    "electric smoke": "mp_weapon_grenade_electric_smoke",
-                    "cold war": "mp_weapon_pulse_lmg",
-                    "satchel": "mp_weapon_satchel",
-                    "eva-8 auto": "mp_weapon_shotgun",
-                    "mozambique": "mp_weapon_shotgun_pistol",
-                    "wingman elite": "mp_weapon_wingman_n",
-                    "gravity star": "mp_weapon_grenade_gravity",
-                    "pulse blade": "mp_weapon_grenade_sonar",
-                    "archer": "mp_weapon_rocket_launcher",
-                    "outOfBounds": "outOfBounds",
-                    "mind crime": "mind_crime",
-                    "devotion": "mp_weapon_esaw",
-                    "fall": "fall",
-                    "p2016": "mp_weapon_semipistol",
-                    "arc grenade": "mp_weapon_grenade_emp",
-                    "hemlok": "mp_weapon_hemlok",
-                    "phase shift": "phase_shift"
-                }
-    
-        weaponid = ""
-        for weapon in weapons:     
-            if(weaponname.lower() in weapon.lower()):     
-                weaponid = weapons[weapon]
-                weaponname = weapon
-                break
-
-        return weaponid, weaponname
-
-    def getserver(self, snippet):
-        server = ""
-        response = requests.get('https://tone.sleepycat.date/v2/client/servers').json()
-        servers = response.keys()
-
-        for i in servers:
-            if(snippet.lower() in i.lower()):
-                if(snippet.lower()== i.lower()):
-                    server = i
-                    break
-                else:
-                    server = i
-
-        return server
-    
-    def getleaderboard(self, board, weaponid="", weaponname="", server=""):
-        easyfilter = False
-        hardfilter = False
-        payload = {"weapon": weaponid, "server": server}
-        response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json()
-        players = response.keys()
-
-        if(board.lower() in ["kills", "deaths", "maxd", "totald"]):
-            if(board.lower() == "totald"):
-                board = "total_distance"
-            if(board.lower() == "maxd"):
-                board = "max_distance"       
-            easyfilter = True
-        else:
-            hardfilter = True
-
-        if(len(players) < 10):
-            lb_length = len(players)
-        else:
-            lb_length = 10
-
-        top10 = {}
-        while(len(top10)<lb_length):
-            current = 0 
-            name = ""
-            for p in players:
-                stats = response[p]
-                if(easyfilter):
-                    checked = stats[str(board)]
-                if(hardfilter):
-                    if(board.lower() == "kd"):
-                        if(weaponid != ""):
-                            deaths = stats['deaths_while_equipped']
-                        else:
-                            deaths = stats['deaths']
-                        if(deaths == 0):
-                            deaths = deaths + 1
-                        checked = round(stats["kills"] / deaths, 2)
-                    if(board.lower() == "avgd"):
-                        if(stats["kills"] == 0):
-                            kills = 1
-                        else:
-                            kills = stats["kills"]
-                        checked = round(stats["total_distance"] / kills, 2)
-                #print(checked, ", ", current )
-                if(checked >= current and stats["username"] not in top10.keys()):
-                     #print(checked, ", ", current)
-                     current = checked
-                     name = stats['username']
-        
-            top10[name] = current
-
-        if(board.lower() == "deaths"):
-            inbetween = "to"
-        else:
-            inbetween = "with"
-
-        if(server == ""):
-            server = "all servers"
-        if(weaponname == ""):
-            weaponname = "any weapon"
-
-        botmessage = str(f"Leaderboard of {board} {inbetween} {weaponname} for {server}\n-------------------------------\n")
-
-        counter = 1
-        for i, j in top10.items():
-            if(hardfilter):
-                stat = str("{:0.2f}".format(j))
-            if(easyfilter):
-                stat = str(j)
-            botmessage = botmessage + str(f"{str(counter):<2}"+ " - " + f"{i :<20}" + " : "+ f"{stat:<8}" + "\n")
-            counter= counter+1 
-
-        return botmessage
    
    @leaderboard.autocomplete("weapon")
    async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
        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:
            if(current.lower() in weapon_choice.lower()):
                data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))
@@ -5,6 +5,11 @@ from discord.ext import commands
 from discord import app_commands
 import requests

+from Reuse.getPlayer import get_all_playerids
+from Reuse.getServer import getserver
+from Reuse.getStats import get_allplayer_stats
+from Reuse.getWeapon import getweaponid
+
 class SlashStats(commands.Cog):
    def __init__(self, client):
        self.client = client
@@ -25,183 +30,29 @@ class SlashStats(commands.Cog):
        playernames = playernames.split(" ")

        async with aiohttp.ClientSession() as session:
-            players = await self.get_all_playerids(session, playernames)
+            players = await get_all_playerids(session, playernames)
            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

            if(weapon != ""):
-                weaponid, weaponname = self.getweaponid(weapon)
+                weaponid, weaponname = getweaponid(weapon)
            if(servername != ""):
-                server = await self.getserver(servername)
+                server = await getserver(session, servername)

        async with aiohttp.ClientSession() as session:
-            botmessage = await self.get_allplayer_stats(session, players.values(), weaponid, weaponname, server)
+            botmessage, img_file = await get_allplayer_stats(session, players.values(), weaponid, weaponname, server)

-        await interaction.response.send_message(embed=botmessage)
+        if(img_file != ""):
+            await interaction.response.send_message(file=img_file, embed=botmessage)
+        else:
+            await interaction.response.send_message(embed=botmessage)

-
-    async def get_all_playerids(self, s, playernames):
-     players = {}
-     tasks = []
-     for playername in playernames:
-          task = asyncio.create_task(self.getplayerid(s, playername),name=playername)
-          tasks.append(task)
-     res = await asyncio.gather(*tasks)
-     for player in res:
-           player = player.split(":")
-           playername = player[0].strip()
-           playerid = player[1].strip()
-           if(playerid != "None" and playername not in players):
-                players[playername] = playerid
-
-     return players
-
-    async def getplayerid(self,s,playername):
-        playerid = ""
-        playername = playername.replace(",", "")
-        payload = str(f"?username={playername}")
-        async with s.get(f'https://northstar.tf/accounts/lookup_uid{payload}') as r:
-                response = await r.json()
-                if (response['matches'] != None and response['matches'] != []):
-                    playerid = response['matches'][0]
-                    player = str(f"{playername.lower()}: {playerid}")
-                else:
-                    player = str(f"{playername.lower()}: {None}")
-                return player
-        
-    def getweaponid(self,givenweapon):
-        weapons ={
-                    "execution": "human_execution", 
-                    "car": "mp_weapon_car",
-                    "charge rifle": "mp_weapon_defender",
-                    "double take": "mp_weapon_doubletake",
-                    "epg": "mp_weapon_epg",
-                    "volt": "mp_weapon_hemlok_smg",
-                    "lstar": "mp_weapon_lstar",
-                    "r97": "mp_weapon_r97",
-                    "r-201": "mp_weapon_rspn101",
-                    "smart pistol": "mp_weapon_smart_pistol",
-                    "kraber": "mp_weapon_sniper",
-                    "flatline": "mp_weapon_vinson",
-                    "re-45 auto": "mp_weapon_autopistol",
-                    "alternator": "mp_weapon_alternator_smg",
-                    "frag grenade": "mp_weapon_frag_grenade",
-                    "g2": "mp_weapon_g2",
-                    "spitfire": "mp_weapon_lmg",
-                    "smr": "mp_weapon_smr",
-                    "softball": "mp_weapon_softball",
-                    "firestar": "mp_weapon_thermite_grenade",
-                    "melee": "melee_pilot_emptyhanded",
-                    "mastiff": "mp_weapon_mastiff",
-                    "mgl": "mp_weapon_mgl",
-                    "r-101": "mp_weapon_rspn101_og",
-                    "wingman": "mp_weapon_wingman",
-                    "invalid": "invalid",
-                    "thunderbolt": "mp_weapon_arc_launcher",
-                    "dmr": "mp_weapon_dmr",
-                    "electric smoke": "mp_weapon_grenade_electric_smoke",
-                    "cold war": "mp_weapon_pulse_lmg",
-                    "satchel": "mp_weapon_satchel",
-                    "eva-8 auto": "mp_weapon_shotgun",
-                    "mozambique": "mp_weapon_shotgun_pistol",
-                    "wingman elite": "mp_weapon_wingman_n",
-                    "gravity star": "mp_weapon_grenade_gravity",
-                    "pulse blade": "mp_weapon_grenade_sonar",
-                    "archer": "mp_weapon_rocket_launcher",
-                    "outOfBounds": "outOfBounds",
-                    "mind crime": "mind_crime",
-                    "devotion": "mp_weapon_esaw",
-                    "fall": "fall",
-                    "p2016": "mp_weapon_semipistol",
-                    "arc grenade": "mp_weapon_grenade_emp",
-                    "hemlok": "mp_weapon_hemlok",
-                    "phase shift": "phase_shift"
-                }
-    
-        weaponid = ""
-        weaponname = ""
-        for weapon in weapons:     
-            if(givenweapon.lower() in weapon.lower()):     
-                weaponid = weapons[weapon]
-                weaponname = weapon
-                break
-
-        return weaponid, weaponname
-
-    async def getserver(self, snippet):
-        server = ""
-        async with aiohttp.ClientSession() as session:
-            async with session.get('https://tone.sleepycat.date/v2/client/servers') as r:
-                response = await r.json()
-                servers = response.keys()
-        for i in servers:
-            if(snippet.lower() == i.lower()):
-                server = i
-                break
-            elif(snippet.lower() in i.lower()):
-                 server = i
-
-        return server
-
-    async def get_allplayer_stats(self, s, playerids, weaponid = "", weaponname= "",server = ""):
-        tasks = []
-        for playerid in playerids:
-            task = asyncio.create_task(self.getstats(s, playerid, weaponid, server), name=playerid)
-            tasks.append(task)
-        res = await asyncio.gather(*tasks)
-        if(server == ""):
-            server = "All"
-        if(weaponname == ""):
-            weaponname = "Any"
-
-        botmessage = discord.Embed(title="Stats", description=f"**Server:** {server}\n**Weapon:** {weaponname}", colour=discord.Colour.orange())
-        if(weaponname != "Any"):
-            if(requests.head(f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png").status_code == 200):
-                botmessage.set_thumbnail(url=f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png")
-            else:
-                botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
-
-        for stats in res:
-            botmessage.add_field(name=f"Stats for {stats['Player']}", value=stats['message'])
-            
-        return botmessage
-
-    async def getstats(self, 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:
-            response = await r.json()
-            if(response == {}):
-                async with s.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}) as Er:
-                    errorresponse = await Er.json()
-                    if(errorresponse['matches'] != None):
-                        playername = errorresponse['matches'][0]
-                        stats = {"Player": playername, "message": "No stats found for this player."}
-                        return stats
-        
-            killstats = response[str(playerid)]
-
-            botmessage = str("Kills: " + str(killstats['kills']) + '\n' )
-              
-            if(weaponid != ""):
-                deaths=killstats['deaths_while_equipped']
-                if(deaths == 0):
-                    deaths = 1;
-                botmessage += str(str("Deaths: " + str(killstats['deaths_while_equipped'])) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))+ '\n' + str("Deaths to: " + str(killstats['deaths']))))
-            else:
-                deaths=killstats['deaths']
-                if(deaths == 0):
-                    deaths = 1;
-                botmessage = botmessage + str("Deaths: " + str(killstats['deaths'])) + '\n' + str("KD: " + str("{:0.2f}".format(killstats['kills']/deaths)))
-
-        stats = {"Player": killstats['username'], "message": botmessage}
-        
-        return stats
    
    @stats.autocomplete("weapon")
    async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
        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:
            if(current.lower() in weapon_choice.lower()):
                data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))