diff --git a/.gitignore b/.gitignore index 4acd06b..f85c6b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -config.py +config.py \ No newline at end of file diff --git a/__pycache__/api.cpython-38.pyc b/__pycache__/api.cpython-38.pyc index ed447ce..765b51a 100644 Binary files a/__pycache__/api.cpython-38.pyc and b/__pycache__/api.cpython-38.pyc differ diff --git a/__pycache__/command_clan_list.cpython-38.pyc b/__pycache__/command_clan_list.cpython-38.pyc index 1ce46fc..b458620 100644 Binary files a/__pycache__/command_clan_list.cpython-38.pyc and b/__pycache__/command_clan_list.cpython-38.pyc differ diff --git a/__pycache__/command_clan_update.cpython-38.pyc b/__pycache__/command_clan_update.cpython-38.pyc index a8db43b..478c6d3 100644 Binary files a/__pycache__/command_clan_update.cpython-38.pyc and b/__pycache__/command_clan_update.cpython-38.pyc differ diff --git a/__pycache__/command_discord_list.cpython-38.pyc b/__pycache__/command_discord_list.cpython-38.pyc index ad5a356..2b33414 100644 Binary files a/__pycache__/command_discord_list.cpython-38.pyc and b/__pycache__/command_discord_list.cpython-38.pyc differ diff --git a/__pycache__/command_discord_update.cpython-38.pyc b/__pycache__/command_discord_update.cpython-38.pyc index dbff74d..b1ee8a8 100644 Binary files a/__pycache__/command_discord_update.cpython-38.pyc and b/__pycache__/command_discord_update.cpython-38.pyc differ diff --git a/__pycache__/command_link_add.cpython-38.pyc b/__pycache__/command_link_add.cpython-38.pyc index 93d46ea..02b9b28 100644 Binary files a/__pycache__/command_link_add.cpython-38.pyc and b/__pycache__/command_link_add.cpython-38.pyc differ diff --git a/__pycache__/command_link_list.cpython-38.pyc b/__pycache__/command_link_list.cpython-38.pyc index ce5ebb0..f76c0cd 100644 Binary files a/__pycache__/command_link_list.cpython-38.pyc and b/__pycache__/command_link_list.cpython-38.pyc differ diff --git a/__pycache__/command_link_remove.cpython-38.pyc b/__pycache__/command_link_remove.cpython-38.pyc index 358de8c..dc956da 100644 Binary files a/__pycache__/command_link_remove.cpython-38.pyc and b/__pycache__/command_link_remove.cpython-38.pyc differ diff --git a/__pycache__/command_link_update.cpython-38.pyc b/__pycache__/command_link_update.cpython-38.pyc index cafcef1..e154ef2 100644 Binary files a/__pycache__/command_link_update.cpython-38.pyc and b/__pycache__/command_link_update.cpython-38.pyc differ diff --git a/__pycache__/command_status.cpython-38.pyc b/__pycache__/command_status.cpython-38.pyc index a5b37ef..343016d 100644 Binary files a/__pycache__/command_status.cpython-38.pyc and b/__pycache__/command_status.cpython-38.pyc differ diff --git a/__pycache__/command_waitinglist_list.cpython-38.pyc b/__pycache__/command_waitinglist_list.cpython-38.pyc index da850c7..3e419a1 100644 Binary files a/__pycache__/command_waitinglist_list.cpython-38.pyc and b/__pycache__/command_waitinglist_list.cpython-38.pyc differ diff --git a/command_link_add.py b/command_link_add.py index 89f7222..dfffc35 100644 --- a/command_link_add.py +++ b/command_link_add.py @@ -1,6 +1,9 @@ import json import discord +h = 'hello time' +g = 'swagg moment' + class User: def __init__(self, brawlhalla_id, brawlhalla_name, discord_id, discord_name): @@ -15,19 +18,34 @@ async def add_link(bot, ctx, brawlhalla_id, discord_id, embed_color): link_data = json.load(data) new_entry = True for user in link_data: + if len(str(brawlhalla_id)) > 3: if str(user['brawlhalla_id']) == str(brawlhalla_id): await ctx.send('brawlhalla_id: ' + brawlhalla_id + ' has already been linked') new_entry = False break + else: + if str(user['brawlhalla_id'])[0:3:1] == str(brawlhalla_id)[0:3:1]: + await ctx.send('brawlhalla_id: ' + brawlhalla_id + + ' has already been linked, if not try entering the full id') + new_entry = False + break + if len(str(discord_id)) > 3: if str(user['discord_id']) == str(discord_id): await ctx.send('discord_id: ' + discord_id + ' has already been linked') new_entry = False break + else: + if str(user['discord_id'])[0:3:1] == str(discord_id)[0:3:1]: + await ctx.send('discord_id: ' + discord_id + + ' has already been linked, if not try entering the full id') + new_entry = False + break brawlhalla_name = 'blank' discord_name = 'blank' + short_hand = False # check if ids are valid if new_entry == True: @@ -40,10 +58,13 @@ async def add_link(bot, ctx, brawlhalla_id, discord_id, embed_color): if str(member['brawlhalla_id']) == str(brawlhalla_id): valid_brawlhalla_id = True brawlhalla_name = member['name'] - elif str(member['brawlhalla_id'])[0:3:1] == str(brawlhalla_id)[0:3:1]: + if valid_brawlhalla_id == False: + for member in clan_data['clan']: + if str(member['brawlhalla_id'])[0:3:1] == str(brawlhalla_id)[0:3:1]: brawlhalla_id = str(member['brawlhalla_id']) valid_brawlhalla_id = True brawlhalla_name = member['name'] + short_hand = True # check dc id with open('./data_discord_' + ctx.guild.name + '.json') as data: discord_data = json.load(data) @@ -51,16 +72,21 @@ async def add_link(bot, ctx, brawlhalla_id, discord_id, embed_color): if str(account['id']) == str(discord_id): valid_discord_id = True discord_name = account['name'] - elif str(account['id'])[0:3:1] == str(discord_id)[0:3:1]: + if valid_discord_id == False: + for account in discord_data: + if str(account['id'])[0:3:1] == str(discord_id)[0:3:1]: discord_id = str(account['id']) valid_discord_id = True discord_name = account['name'] + short_hand = True # if entry ids are valid, add it if ((valid_brawlhalla_id == True) and (valid_discord_id == True) and (new_entry == True)): - - await ctx.send('Are you sure you want to add the following link?,') + if short_hand == True: + await ctx.send("I couldn't find the exact id's but I found the following id's. If these are wrong try writing out the full id's") + else: + await ctx.send('Are you sure you want to add the following link?,') await ctx.send( embed=discord.Embed(description='**brawlhalla_id**: ' + brawlhalla_id + '\n**brawlhalla_name**: ' + diff --git a/data_clan_Dair.json b/data_clan_Dair.json index fa689c7..2abd4db 100644 --- a/data_clan_Dair.json +++ b/data_clan_Dair.json @@ -1 +1,3 @@ -{"clan_id": 1357965, "clan_name": "Dair", "clan_create_date": 1609151553, "clan_xp": "1593949", "clan": [{"brawlhalla_id": 6746620, "name": "sgrape", "rank": "Leader", "join_date": 1656780578, "xp": 37864}, {"brawlhalla_id": 4070196, "name": "Goofy", "rank": "Officer", "join_date": 1656782361, "xp": 50905}, {"brawlhalla_id": 23890819, "name": "Benjihypp\u00c3\u00a4\u00c3\u00a4j\u00c3\u00a4", "rank": "Member", "join_date": 1656786527, "xp": 22760}, {"brawlhalla_id": 24664406, "name": "Titty sucker", "rank": "Member", "join_date": 1656792002, "xp": 21934}, {"brawlhalla_id": 27930713, "name": "Madison", "rank": "Member", "join_date": 1656840626, "xp": 24160}, {"brawlhalla_id": 35664307, "name": "cat gang | yum", "rank": "Member", "join_date": 1656842131, "xp": 44317}, {"brawlhalla_id": 59561496, "name": "Memory", "rank": "Member", "join_date": 1656848208, "xp": 36861}, {"brawlhalla_id": 29109995, "name": "SiLver", "rank": "Member", "join_date": 1656857493, "xp": 21808}, {"brawlhalla_id": 34242870, "name": "$now?!", "rank": "Member", "join_date": 1656864319, "xp": 76566}, {"brawlhalla_id": 43401640, "name": "FuuuX", "rank": "Member", "join_date": 1656873217, "xp": 28286}, {"brawlhalla_id": 8948682, "name": "Devolos", "rank": "Member", "join_date": 1656875188, "xp": 27795}, {"brawlhalla_id": 7974814, "name": "ZAW;", "rank": "Member", "join_date": 1656880761, "xp": 23872}, {"brawlhalla_id": 9569848, "name": "1dimensionalbucket", "rank": "Member", "join_date": 1656883554, "xp": 14863}, {"brawlhalla_id": 35710376, "name": "Camila.", "rank": "Member", "join_date": 1656945111, "xp": 4050}, {"brawlhalla_id": 3711805, "name": "flower", "rank": "Member", "join_date": 1656968084, "xp": 34099}, {"brawlhalla_id": 454666, "name": "Zabulon", "rank": "Member", "join_date": 1657047191, "xp": 20505}, {"brawlhalla_id": 57482158, "name": "walter white", "rank": "Member", "join_date": 1657053675, "xp": 30856}, {"brawlhalla_id": 7142017, "name": "Julian", "rank": "Member", "join_date": 1657123140, "xp": 25122}, {"brawlhalla_id": 40321889, "name": "peon", "rank": "Member", "join_date": 1657370066, "xp": 43199}, {"brawlhalla_id": 5671092, "name": "Skeldra", "rank": "Member", "join_date": 1657473993, "xp": 19066}, {"brawlhalla_id": 9626815, "name": "Rasdos", "rank": "Member", "join_date": 1657476377, "xp": 49157}, {"brawlhalla_id": 830910, "name": "Dagmar <3", "rank": "Officer", "join_date": 1657568746, "xp": 36595}, {"brawlhalla_id": 7220395, "name": "Kami", "rank": "Member", "join_date": 1657578939, "xp": 21275}, {"brawlhalla_id": 9070717, "name": "TragicX7", "rank": "Member", "join_date": 1657581252, "xp": 15352}, {"brawlhalla_id": 7846170, "name": "Joryes", "rank": "Member", "join_date": 1657615456, "xp": 18518}, {"brawlhalla_id": 7294526, "name": "MG", "rank": "Member", "join_date": 1658169785, "xp": 33082}, {"brawlhalla_id": 10352807, "name": "Doku", "rank": "Member", "join_date": 1658170826, "xp": 16494}, {"brawlhalla_id": 8275242, "name": "Jhonny", "rank": "Member", "join_date": 1658174887, "xp": 22969}, {"brawlhalla_id": 5503396, "name": "MRB", "rank": "Member", "join_date": 1658345270, "xp": 37016}, {"brawlhalla_id": 7159263, "name": "PCS | Shadra - Baguette senpai", "rank": "Member", "join_date": 1658395590, "xp": 31652}, {"brawlhalla_id": 3013356, "name": "cat gang | oszcar", "rank": "Member", "join_date": 1658856944, "xp": 61662}, {"brawlhalla_id": 2600667, "name": "SamiGigi", "rank": "Member", "join_date": 1658948471, "xp": 9645}, {"brawlhalla_id": 69630716, "name": "idiot sandwich", "rank": "Member", "join_date": 1659274583, "xp": 69247}, {"brawlhalla_id": 26084391, "name": ".diline", "rank": "Member", "join_date": 1660910171, "xp": 6931}, {"brawlhalla_id": 70022787, "name": "twitch.tv/ma2st4er5", "rank": "Officer", "join_date": 1660934058, "xp": 20219}, {"brawlhalla_id": 5111230, "name": "WelFe", "rank": "Member", "join_date": 1660938600, "xp": 10612}, {"brawlhalla_id": 7364605, "name": "CrossyChainsaw", "rank": "Member", "join_date": 1660940056, "xp": 6372}, {"brawlhalla_id": 26417667, "name": "Dobleh #Lidia", "rank": "Member", "join_date": 1660940976, "xp": 12335}, {"brawlhalla_id": 9048248, "name": "Lil Liser <3", "rank": "Member", "join_date": 1660989573, "xp": 6372}, {"brawlhalla_id": 83366016, "name": "twitch.tv/WhisperBH", "rank": "Member", "join_date": 1661004909, "xp": 12500}, {"brawlhalla_id": 1209176, "name": "Mama Lopunny", "rank": "Member", "join_date": 1661021682, "xp": 9622}, {"brawlhalla_id": 3764805, "name": "Lil'Fox <3", "rank": "Member", "join_date": 1661104096, "xp": 10037}, {"brawlhalla_id": 3794093, "name": "MrEmpanadilla19", "rank": "Member", "join_date": 1661640242, "xp": 17405}, {"brawlhalla_id": 3995547, "name": "iiTzHairu!?", "rank": "Member", "join_date": 1661858269, "xp": 3983}, {"brawlhalla_id": 3221385, "name": "the neutral duck (Eldad)", "rank": "Member", "join_date": 1661870719, "xp": 6174}, {"brawlhalla_id": 42572878, "name": "xFabio", "rank": "Member", "join_date": 1661871499, "xp": 8237}, {"brawlhalla_id": 79329873, "name": "ian", "rank": "Member", "join_date": 1662154023, "xp": 6280}, {"brawlhalla_id": 1892771, "name": "Vooltex", "rank": "Member", "join_date": 1662154025, "xp": 600}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1662208545, "xp": 1050}]} \ No newline at end of file + +{"clan_id": 1357965, "clan_name": "Dair", "clan_create_date": 1609151553, "clan_xp": "1750697", "clan": [{"brawlhalla_id": 6746620, "name": "sgrape", "rank": "Leader", "join_date": 1656780578, "xp": 42651}, {"brawlhalla_id": 4070196, "name": "Goofy", "rank": "Officer", "join_date": 1656782361, "xp": 54716}, {"brawlhalla_id": 23890819, "name": "Benjihypp\u00c3\u00a4\u00c3\u00a4j\u00c3\u00a4", "rank": "Member", "join_date": 1656786527, "xp": 22760}, {"brawlhalla_id": 24664406, "name": "Titty sucker", "rank": "Member", "join_date": 1656792002, "xp": 23526}, {"brawlhalla_id": 27930713, "name": "Madison", "rank": "Member", "join_date": 1656840626, "xp": 24160}, {"brawlhalla_id": 35664307, "name": "Brawler", "rank": "Member", "join_date": 1656842131, "xp": 48377}, {"brawlhalla_id": 59561496, "name": "Memory", "rank": "Member", "join_date": 1656848208, "xp": 39666}, {"brawlhalla_id": 29109995, "name": "SiLver", "rank": "Member", "join_date": 1656857493, "xp": 22621}, {"brawlhalla_id": 34242870, "name": "$now?!", "rank": "Member", "join_date": 1656864319, "xp": 83441}, {"brawlhalla_id": 43401640, "name": "FuuuX", "rank": "Member", "join_date": 1656873217, "xp": 30051}, {"brawlhalla_id": 8948682, "name": "Devolos", "rank": "Member", "join_date": 1656875188, "xp": 30153}, {"brawlhalla_id": 7974814, "name": "ZAW;", "rank": "Member", "join_date": 1656880761, "xp": 27866}, {"brawlhalla_id": 9569848, "name": "1dimensionalbucket", "rank": "Member", "join_date": 1656883554, "xp": 14863}, {"brawlhalla_id": 3711805, "name": "flower", "rank": "Member", "join_date": 1656968084, "xp": 36808}, {"brawlhalla_id": 454666, "name": "Zabulon", "rank": "Member", "join_date": 1657047191, "xp": 21739}, {"brawlhalla_id": 57482158, "name": "walter white", "rank": "Member", "join_date": 1657053675, "xp": 33692}, {"brawlhalla_id": 40321889, "name": "peon", "rank": "Member", "join_date": 1657370066, "xp": 47004}, {"brawlhalla_id": 5671092, "name": "Skeldra", "rank": "Member", "join_date": 1657473993, "xp": 19618}, {"brawlhalla_id": 9626815, "name": "Rasdos", "rank": "Member", "join_date": 1657476377, "xp": 55318}, {"brawlhalla_id": 830910, "name": "Dagmar <3", "rank": "Officer", "join_date": 1657568746, "xp": 44960}, {"brawlhalla_id": 7220395, "name": "Kami", "rank": "Member", "join_date": 1657578939, "xp": 24422}, {"brawlhalla_id": 9070717, "name": "TragicX7", "rank": "Member", "join_date": 1657581252, "xp": 15352}, {"brawlhalla_id": 7846170, "name": "Joryes", "rank": "Member", "join_date": 1657615456, "xp": 20156}, {"brawlhalla_id": 7294526, "name": "MG", "rank": "Member", "join_date": 1658169785, "xp": 37508}, {"brawlhalla_id": 10352807, "name": "Doku", "rank": "Member", "join_date": 1658170826, "xp": 20314}, {"brawlhalla_id": 8275242, "name": "Jhonny", "rank": "Member", "join_date": 1658174887, "xp": 23626}, {"brawlhalla_id": 5503396, "name": "MRB", "rank": "Member", "join_date": 1658345270, "xp": 39443}, {"brawlhalla_id": 7159263, "name": "PCS | Shadra - Baguette senpai", "rank": "Member", "join_date": 1658395590, "xp": 34079}, {"brawlhalla_id": 3013356, "name": "oszcar", "rank": "Member", "join_date": 1658856944, "xp": 64931}, {"brawlhalla_id": 2600667, "name": "SamiGigi", "rank": "Member", "join_date": 1658948471, "xp": 11584}, {"brawlhalla_id": 69630716, "name": "nuts", "rank": "Member", "join_date": 1659274583, "xp": 78738}, {"brawlhalla_id": 26084391, "name": ".diline", "rank": "Member", "join_date": 1660910171, "xp": 6931}, {"brawlhalla_id": 70022787, "name": "twitch.tv/ma2st4er5", "rank": "Officer", "join_date": 1660934058, "xp": 27293}, {"brawlhalla_id": 5111230, "name": "WelFe", "rank": "Member", "join_date": 1660938600, "xp": 16990}, {"brawlhalla_id": 7364605, "name": "CrossyChainsaw", "rank": "Member", "join_date": 1660940056, "xp": 6605}, {"brawlhalla_id": 26417667, "name": "Dobleh #Lidia", "rank": "Member", "join_date": 1660940976, "xp": 18052}, {"brawlhalla_id": 9048248, "name": "Lil Liser <3", "rank": "Member", "join_date": 1660989573, "xp": 9344}, {"brawlhalla_id": 83366016, "name": "twitch.tv/WhisperBH", "rank": "Member", "join_date": 1661004909, "xp": 16756}, {"brawlhalla_id": 3764805, "name": "Lil'Fox <3", "rank": "Member", "join_date": 1661104096, "xp": 11745}, {"brawlhalla_id": 3794093, "name": "MrEmpanadilla19", "rank": "Member", "join_date": 1661640242, "xp": 24574}, {"brawlhalla_id": 3995547, "name": "PCS | iiTzHairu!?", "rank": "Member", "join_date": 1661858269, "xp": 5052}, {"brawlhalla_id": 3221385, "name": "the neutral duck (Eldad)", "rank": "Member", "join_date": 1661870719, "xp": 11905}, {"brawlhalla_id": 42572878, "name": "xFabio", "rank": "Member", "join_date": 1661871499, "xp": 12535}, {"brawlhalla_id": 79329873, "name": "ian", "rank": "Member", "join_date": 1662154023, "xp": 11737}, {"brawlhalla_id": 1892771, "name": "Vooltex", "rank": "Member", "join_date": 1662154025, "xp": 600}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1662208545, "xp": 3511}, {"brawlhalla_id": 38970073, "name": "\u00e2\u0080\u00a0 lovely \u00e1\u0083\u00a6", "rank": "Member", "join_date": 1662691135, "xp": 4880}, {"brawlhalla_id": 3565388, "name": "Excellence", "rank": "Member", "join_date": 1662750501, "xp": 2465}, {"brawlhalla_id": 3615467, "name": ".", "rank": "Member", "join_date": 1662902127, "xp": 1123}, {"brawlhalla_id": 8830089, "name": "UnderF\u00c3\u00b8x", "rank": "Member", "join_date": 1662991488, "xp": 1459}]} + diff --git a/data_clan_Iratus niggas.json b/data_clan_Iratus niggas.json index ba08993..27a0cdf 100644 --- a/data_clan_Iratus niggas.json +++ b/data_clan_Iratus niggas.json @@ -1 +1,3 @@ -{"clan_id": 1998475, "clan_name": "Iratus", "clan_create_date": 1662159711, "clan_xp": "30004", "clan": [{"brawlhalla_id": 28054305, "name": "\u00e4\u00b8\u0082gishide", "rank": "Leader", "join_date": 1662159807, "xp": 2991}, {"brawlhalla_id": 61355963, "name": "\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096", "rank": "Officer", "join_date": 1662160170, "xp": 4176}, {"brawlhalla_id": 9316238, "name": "Serendipity", "rank": "Officer", "join_date": 1662160201, "xp": 3139}, {"brawlhalla_id": 33893717, "name": "Professional_gamer09(italian)", "rank": "Member", "join_date": 1662160289, "xp": 2992}, {"brawlhalla_id": 6261062, "name": "I am a dwarf", "rank": "Member", "join_date": 1662160748, "xp": 1082}, {"brawlhalla_id": 1509948, "name": "Just k0sy", "rank": "Member", "join_date": 1662164345, "xp": 1240}, {"brawlhalla_id": 6244176, "name": "sukaroo?!", "rank": "Member", "join_date": 1662226618, "xp": 8938}, {"brawlhalla_id": 49993518, "name": "rias", "rank": "Officer", "join_date": 1662405410, "xp": 2495}, {"brawlhalla_id": 5448743, "name": "iSwiits", "rank": "Member", "join_date": 1662471087, "xp": 1285}, {"brawlhalla_id": 59886322, "name": "TIKIS", "rank": "Member", "join_date": 1662558775, "xp": 983}, {"brawlhalla_id": 5920747, "name": "\u00ed\u0095\u0098\u00eb\u008a\u0098 | Sky", "rank": "Member", "join_date": 1662560362, "xp": 322}]} \ No newline at end of file + +{"clan_id": 1998475, "clan_name": "Iratus", "clan_create_date": 1662159711, "clan_xp": "44727", "clan": [{"brawlhalla_id": 28054305, "name": "\u00e4\u00b8\u0082gishide", "rank": "Leader", "join_date": 1662159807, "xp": 5024}, {"brawlhalla_id": 61355963, "name": "\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096\u00e3\u0084\u0096", "rank": "Officer", "join_date": 1662160170, "xp": 6111}, {"brawlhalla_id": 9316238, "name": "Serendipity", "rank": "Officer", "join_date": 1662160201, "xp": 4195}, {"brawlhalla_id": 33893717, "name": "Professional_gamer09(italian)", "rank": "Member", "join_date": 1662160289, "xp": 4563}, {"brawlhalla_id": 6261062, "name": "I am a dwarf", "rank": "Member", "join_date": 1662160748, "xp": 1585}, {"brawlhalla_id": 1509948, "name": "Just k0sy", "rank": "Member", "join_date": 1662164345, "xp": 2052}, {"brawlhalla_id": 6244176, "name": "Madara Uchiha", "rank": "Member", "join_date": 1662226618, "xp": 14082}, {"brawlhalla_id": 5448743, "name": "iSwiits", "rank": "Member", "join_date": 1662471087, "xp": 1285}, {"brawlhalla_id": 5920747, "name": "\u00ed\u0095\u0098\u00eb\u008a\u0098 | Sky", "rank": "Member", "join_date": 1662560362, "xp": 805}, {"brawlhalla_id": 83490089, "name": "KurdiAras", "rank": "Member", "join_date": 1662767963, "xp": 57}, {"brawlhalla_id": 83488873, "name": "LEGEND_Hamudi", "rank": "Member", "join_date": 1662767974, "xp": 57}]} + diff --git a/data_discord_Dair.json b/data_discord_Dair.json index 5aaf1c9..fca4212 100644 --- a/data_discord_Dair.json +++ b/data_discord_Dair.json @@ -1 +1,3 @@ -[{"id": 403256828139667457, "name": "ZAW."}, {"id": 223047336190803968, "name": "Dagmar"}, {"id": 413070742591373314, "name": "CrossyChainsaw"}, {"id": 286170697045114880, "name": "Zabulon"}, {"id": 711069947530444810, "name": "ma2st4er5"}, {"id": 374970213503991808, "name": "Joryes"}, {"id": 148177292831490048, "name": "SamiGigi"}, {"id": 289386297527894016, "name": "diline"}, {"id": 239085180793389057, "name": "oszcar"}, {"id": 536465855329075230, "name": "Vooltex"}, {"id": 541252363873157130, "name": "\ud835\udd3d\u1d58\u1d58\u1d58\ud835\udd4f"}, {"id": 689235416334991367, "name": "daddymyers"}, {"id": 360866188684689409, "name": "Dobleh"}, {"id": 260514425180651520, "name": "Rasdos"}, {"id": 576065425507352607, "name": "Ashuramaru"}, {"id": 323796368571367426, "name": "jona55"}, {"id": 394967313041981442, "name": "Shadra - Baguette senpai"}, {"id": 344762518033399809, "name": "Lil'Fox <3"}, {"id": 648264475585019919, "name": "Lil Liser"}, {"id": 312268746095984660, "name": "Sarcasm"}, {"id": 468520189781082112, "name": "Goofy"}, {"id": 133212563470024705, "name": "woop?"}, {"id": 439889501318545418, "name": "Brandon"}, {"id": 167672644676616192, "name": "Skeldra"}, {"id": 455494656340393984, "name": "TragicX7"}, {"id": 397723268288610304, "name": "yum"}, {"id": 413755738498924556, "name": "benji"}, {"id": 613339572918681641, "name": "ian."}, {"id": 509030415496118293, "name": "rufus"}, {"id": 339373883146764288, "name": "Sgrape"}, {"id": 312192465002168330, "name": "Panda MG"}, {"id": 331021925105270787, "name": "Camila."}, {"id": 551802590401396746, "name": "$now"}, {"id": 600370964441726986, "name": "Preya"}, {"id": 333980718013349898, "name": "SiLver"}, {"id": 249219377688215552, "name": "WelFe"}, {"id": 251416520322711553, "name": "Jhonny"}, {"id": 478488248034000897, "name": "Doku"}, {"id": 265089434398097408, "name": "El Eldad"}, {"id": 392272785902403597, "name": "Tyler<3"}, {"id": 325386848820002836, "name": "MrEmpanadilla19"}, {"id": 777930939888173058, "name": "PNX"}, {"id": 317567558112772098, "name": "Devolos"}, {"id": 247362525715234818, "name": "JuL-_-iaN"}, {"id": 697456577539604510, "name": "sage"}, {"id": 240012542968201216, "name": "Lewis."}, {"id": 233635358791827456, "name": "xFabioh"}, {"id": 857999101537812500, "name": "flower"}, {"id": 691049223335968870, "name": "Whisper"}] \ No newline at end of file + +[{"id": 551802590401396746, "name": "$now"}, {"id": 413070742591373314, "name": "CrossyChainsaw"}, {"id": 286170697045114880, "name": "Zabulon"}, {"id": 711069947530444810, "name": "ma2st4er5"}, {"id": 374970213503991808, "name": "Joryes"}, {"id": 148177292831490048, "name": "SamiGigi"}, {"id": 403256828139667457, "name": "ZAW."}, {"id": 397560189273899028, "name": "l o v e l y \u8ff7\u4eba\u7684"}, {"id": 289386297527894016, "name": "diline"}, {"id": 239085180793389057, "name": "oszcar"}, {"id": 536465855329075230, "name": "Vooltex"}, {"id": 541252363873157130, "name": "\ud835\udd3d\u1d58\u1d58\u1d58\ud835\udd4f"}, {"id": 689235416334991367, "name": "Walter white"}, {"id": 360866188684689409, "name": "Dobleh"}, {"id": 260514425180651520, "name": "Rasdos"}, {"id": 576065425507352607, "name": "Ashuramaru"}, {"id": 323796368571367426, "name": "jona55"}, {"id": 394967313041981442, "name": "Shadra - Baguette senpai"}, {"id": 344762518033399809, "name": "Lil'Fox <3"}, {"id": 343361847631675404, "name": "UnderFox"}, {"id": 648264475585019919, "name": "Lil Liser"}, {"id": 312268746095984660, "name": "Sarcasm"}, {"id": 468520189781082112, "name": "Goofy"}, {"id": 322658711808114688, "name": "Neru"}, {"id": 439889501318545418, "name": "Brandon"}, {"id": 167672644676616192, "name": "Skeldra"}, {"id": 455494656340393984, "name": "TragicX7"}, {"id": 397723268288610304, "name": "yum"}, {"id": 413755738498924556, "name": "benji"}, {"id": 613339572918681641, "name": "ian."}, {"id": 509030415496118293, "name": "rufus"}, {"id": 339373883146764288, "name": "Sgrape"}, {"id": 312192465002168330, "name": "Panda MG"}, {"id": 600370964441726986, "name": "Preya"}, {"id": 333980718013349898, "name": "SiLver"}, {"id": 249219377688215552, "name": "WelFe"}, {"id": 251416520322711553, "name": "Jhonny"}, {"id": 223047336190803968, "name": "Dagmar <3"}, {"id": 319204608658636811, "name": "Excellence"}, {"id": 478488248034000897, "name": "Doku"}, {"id": 265089434398097408, "name": "El Eldad"}, {"id": 392272785902403597, "name": "Tyler<3"}, {"id": 325386848820002836, "name": "MrEmpanadilla19"}, {"id": 777930939888173058, "name": "PNX"}, {"id": 317567558112772098, "name": "Devolos"}, {"id": 697456577539604510, "name": "sage"}, {"id": 240012542968201216, "name": "Lewis."}, {"id": 233635358791827456, "name": "xFabioh"}, {"id": 857999101537812500, "name": "flower"}, {"id": 691049223335968870, "name": "Whisper"}] + diff --git a/data_discord_Iratus niggas.json b/data_discord_Iratus niggas.json index eee5f8b..d3be23b 100644 --- a/data_discord_Iratus niggas.json +++ b/data_discord_Iratus niggas.json @@ -1 +1,3 @@ -[{"id": 261474491060715520, "name": "ChrisSkyRo"}, {"id": 361476536139776032, "name": "Disastratis"}, {"id": 399163789397983234, "name": "mamamia"}, {"id": 425069446697189381, "name": "JuninZika"}, {"id": 442041573383995415, "name": "Nymphe!?"}, {"id": 552032277803302913, "name": "gishide"}, {"id": 746433776929734748, "name": "abzyo"}, {"id": 875447122919567370, "name": "sukaroo"}, {"id": 1011032741778837514, "name": "rias"}] \ No newline at end of file + +[{"id": 261474491060715520, "name": "ChrisSkyRo"}, {"id": 361476536139776032, "name": "Disastratis"}, {"id": 399163789397983234, "name": "mamamia"}, {"id": 425069446697189381, "name": "JuninZika"}, {"id": 442041573383995415, "name": "Nymphe!?"}, {"id": 552032277803302913, "name": "gishide"}, {"id": 746433776929734748, "name": "abzyo"}, {"id": 875447122919567370, "name": "sukaroo"}] + diff --git a/data_link_Dair.json b/data_link_Dair.json index c92d5e2..a6cf1f8 100644 --- a/data_link_Dair.json +++ b/data_link_Dair.json @@ -1 +1 @@ -[{"brawlhalla_id": "6746620", "brawlhalla_name": "sgrape", "discord_id": "339373883146764288", "discord_name": "Sgrape"}, {"brawlhalla_id": "5111230", "brawlhalla_name": "WelFe", "discord_id": "249219377688215552", "discord_name": "WelFe"}, {"brawlhalla_id": "7159263", "brawlhalla_name": "PCS | Shadra - Baguette senpai", "discord_id": "394967313041981442", "discord_name": "Shadra - Baguette senpai"}, {"brawlhalla_id": "4070196", "brawlhalla_name": "Goofy", "discord_id": "468520189781082112", "discord_name": "Goofy"}, {"brawlhalla_id": "5671092", "brawlhalla_name": "Skeldra", "discord_id": "167672644676616192", "discord_name": "Skeldra"}, {"brawlhalla_id": "26417667", "brawlhalla_name": "Dobleh #Lidia", "discord_id": "360866188684689409", "discord_name": "Dobleh"}, {"brawlhalla_id": "9626815", "brawlhalla_name": "Rasdos", "discord_id": "260514425180651520", "discord_name": "Rasdos"}, {"brawlhalla_id": "10352807", "brawlhalla_name": "Doku", "discord_id": "478488248034000897", "discord_name": "Doku"}, {"brawlhalla_id": "34242870", "brawlhalla_name": "cat gang | $now?!", "discord_id": "551802590401396746", "discord_name": "$now"}, {"brawlhalla_id": "26084391", "brawlhalla_name": ".diline", "discord_id": "289386297527894016", "discord_name": "diline"}, {"brawlhalla_id": "3013356", "brawlhalla_name": "oszcar", "discord_id": "239085180793389057", "discord_name": "oszcar"}, {"brawlhalla_id": "23890819", "brawlhalla_name": "Benjihypp\u00c3\u00a4\u00c3\u00a4j\u00c3\u00a4", "discord_id": "413755738498924556", "discord_name": "benji"}, {"brawlhalla_id": "69630716", "brawlhalla_name": "cat gang | sH", "discord_id": "697456577539604510", "discord_name": "sage"}, {"brawlhalla_id": "35664307", "brawlhalla_name": "cat gang | yum", "discord_id": "397723268288610304", "discord_name": "yum"}, {"brawlhalla_id": "29109995", "brawlhalla_name": "SiLver", "discord_id": "333980718013349898", "discord_name": "SiLver"}, {"brawlhalla_id": "43401640", "brawlhalla_name": "FuuuX", "discord_id": "541252363873157130", "discord_name": "\ud835\udd3d\u1d58\u1d58\u1d58\ud835\udd4f"}, {"brawlhalla_id": "24664406", "brawlhalla_name": "Drunk boy", "discord_id": "240012542968201216", "discord_name": "Lewis."}, {"brawlhalla_id": "27930713", "brawlhalla_name": "Madison", "discord_id": "600370964441726986", "discord_name": "Preya"}, {"brawlhalla_id": "8948682", "brawlhalla_name": "La Planta", "discord_id": "317567558112772098", "discord_name": "La Planta"}, {"brawlhalla_id": "35710376", "brawlhalla_name": "Camila.", "discord_id": "331021925105270787", "discord_name": "Camila."}, {"brawlhalla_id": "3711805", "brawlhalla_name": "flower", "discord_id": "857999101537812500", "discord_name": "flower"}, {"brawlhalla_id": "454666", "brawlhalla_name": "Zabulon", "discord_id": "286170697045114880", "discord_name": "Zabulon"}, {"brawlhalla_id": "7974814", "brawlhalla_name": "ZAW;", "discord_id": "403256828139667457", "discord_name": "ZAW."}, {"brawlhalla_id": "7142017", "brawlhalla_name": "Julian", "discord_id": "247362525715234818", "discord_name": "JuL-_-iaN"}, {"brawlhalla_id": "830910", "brawlhalla_name": "Dagmar <3", "discord_id": "223047336190803968", "discord_name": "Huntwess"}, {"brawlhalla_id": "9070717", "brawlhalla_name": "TragicX7", "discord_id": "455494656340393984", "discord_name": "TragicX7"}, {"brawlhalla_id": "7846170", "brawlhalla_name": "Joryes", "discord_id": "374970213503991808", "discord_name": "Joryes"}, {"brawlhalla_id": "9569848", "brawlhalla_name": "1dimensionalbucket", "discord_id": "323796368571367426", "discord_name": "jona55"}, {"brawlhalla_id": "40321889", "brawlhalla_name": "peon", "discord_id": "777930939888173058", "discord_name": "PNX"}, {"brawlhalla_id": "59561496", "brawlhalla_name": "Memory", "discord_id": "312268746095984660", "discord_name": "Sarcasm"}, {"brawlhalla_id": "5503396", "brawlhalla_name": "MRB", "discord_id": "439889501318545418", "discord_name": "Brandon"}, {"brawlhalla_id": "7220395", "brawlhalla_name": "Kami", "discord_id": "392272785902403597", "discord_name": "Tyler<3"}, {"brawlhalla_id": "7294526", "brawlhalla_name": "MG", "discord_id": "312192465002168330", "discord_name": "Panda MG"}, {"brawlhalla_id": "2600667", "brawlhalla_name": "SamiGigi", "discord_id": "148177292831490048", "discord_name": "SamiGigi"}, {"brawlhalla_id": "8275242", "brawlhalla_name": "Jhonny", "discord_id": "251416520322711553", "discord_name": "Jhonny"}, {"brawlhalla_id": "57482158", "brawlhalla_name": "walter white", "discord_id": "689235416334991367", "discord_name": "daddymyers"}, {"brawlhalla_id": "9048248", "brawlhalla_name": "Lil Liser <3", "discord_id": "648264475585019919", "discord_name": "Lil Liser"}, {"brawlhalla_id": "83366016", "brawlhalla_name": "twitch.tv/WhisperBH", "discord_id": "691049223335968870", "discord_name": "SUPER STRONG"}, {"brawlhalla_id": "1209176", "brawlhalla_name": "cat gang | woop!?", "discord_id": "133212563470024705", "discord_name": "woop?"}, {"brawlhalla_id": "3764805", "brawlhalla_name": "Lil'Fox <3", "discord_id": "344762518033399809", "discord_name": "Kyouno Natsumi <3"}, {"brawlhalla_id": "42572878", "brawlhalla_name": "xFabio", "discord_id": "233635358791827456", "discord_name": "xFabioh"}, {"brawlhalla_id": "3221385", "brawlhalla_name": "the neutral duck (Eldad)", "discord_id": "265089434398097408", "discord_name": "El Eldad"}, {"brawlhalla_id": "3794093", "brawlhalla_name": "MrEmpanadilla19", "discord_id": "325386848820002836", "discord_name": "MrEmpanadilla19"}, {"brawlhalla_id": "3995547", "brawlhalla_name": "iiTzHairu!?", "discord_id": "576065425507352607", "discord_name": "Ashuramaru"}, {"brawlhalla_id": "7364605", "brawlhalla_name": "CrossyChainsaw", "discord_id": "413070742591373314", "discord_name": "CrossyChainsaw"}, {"brawlhalla_id": "70022787", "brawlhalla_name": "twitch.tv/ma2st4er5", "discord_id": "711069947530444810", "discord_name": "ma2st4er5"}, {"brawlhalla_id": "79329873", "brawlhalla_name": "ian", "discord_id": "613339572918681641", "discord_name": "ian."}, {"brawlhalla_id": "1892771", "brawlhalla_name": "Vooltex", "discord_id": "536465855329075230", "discord_name": "Vooltex"}, {"brawlhalla_id": "35913608", "brawlhalla_name": "rufus", "discord_id": "509030415496118293", "discord_name": "rufus"}] \ No newline at end of file +[{"brawlhalla_id": "6746620", "brawlhalla_name": "sgrape", "discord_id": "339373883146764288", "discord_name": "Sgrape"}, {"brawlhalla_id": "5111230", "brawlhalla_name": "WelFe", "discord_id": "249219377688215552", "discord_name": "WelFe"}, {"brawlhalla_id": "7159263", "brawlhalla_name": "PCS | Shadra - Baguette senpai", "discord_id": "394967313041981442", "discord_name": "Shadra - Baguette senpai"}, {"brawlhalla_id": "4070196", "brawlhalla_name": "Goofy", "discord_id": "468520189781082112", "discord_name": "Goofy"}, {"brawlhalla_id": "5671092", "brawlhalla_name": "Skeldra", "discord_id": "167672644676616192", "discord_name": "Skeldra"}, {"brawlhalla_id": "26417667", "brawlhalla_name": "Dobleh #Lidia", "discord_id": "360866188684689409", "discord_name": "Dobleh"}, {"brawlhalla_id": "9626815", "brawlhalla_name": "Rasdos", "discord_id": "260514425180651520", "discord_name": "Rasdos"}, {"brawlhalla_id": "10352807", "brawlhalla_name": "Doku", "discord_id": "478488248034000897", "discord_name": "Doku"}, {"brawlhalla_id": "34242870", "brawlhalla_name": "$now?!", "discord_id": "551802590401396746", "discord_name": "$now"}, {"brawlhalla_id": "26084391", "brawlhalla_name": ".diline", "discord_id": "289386297527894016", "discord_name": "diline"}, {"brawlhalla_id": "3013356", "brawlhalla_name": "oszcar", "discord_id": "239085180793389057", "discord_name": "oszcar"}, {"brawlhalla_id": "23890819", "brawlhalla_name": "Benjihypp\u00c3\u00a4\u00c3\u00a4j\u00c3\u00a4", "discord_id": "413755738498924556", "discord_name": "benji"}, {"brawlhalla_id": "69630716", "brawlhalla_name": "nuts", "discord_id": "697456577539604510", "discord_name": "sage"}, {"brawlhalla_id": "29109995", "brawlhalla_name": "SiLver", "discord_id": "333980718013349898", "discord_name": "SiLver"}, {"brawlhalla_id": "43401640", "brawlhalla_name": "FuuuX", "discord_id": "541252363873157130", "discord_name": "\ud835\udd3d\u1d58\u1d58\u1d58\ud835\udd4f"}, {"brawlhalla_id": "24664406", "brawlhalla_name": "Titty sucker", "discord_id": "240012542968201216", "discord_name": "Lewis."}, {"brawlhalla_id": "27930713", "brawlhalla_name": "Madison", "discord_id": "600370964441726986", "discord_name": "Preya"}, {"brawlhalla_id": "8948682", "brawlhalla_name": "Devolos", "discord_id": "317567558112772098", "discord_name": "La Planta"}, {"brawlhalla_id": "3711805", "brawlhalla_name": "flower", "discord_id": "857999101537812500", "discord_name": "flower"}, {"brawlhalla_id": "454666", "brawlhalla_name": "Zabulon", "discord_id": "286170697045114880", "discord_name": "Zabulon"}, {"brawlhalla_id": "7974814", "brawlhalla_name": "ZAW;", "discord_id": "403256828139667457", "discord_name": "ZAW."}, {"brawlhalla_id": "830910", "brawlhalla_name": "Dagmar <3", "discord_id": "223047336190803968", "discord_name": "Huntwess"}, {"brawlhalla_id": "9070717", "brawlhalla_name": "TragicX7", "discord_id": "455494656340393984", "discord_name": "TragicX7"}, {"brawlhalla_id": "7846170", "brawlhalla_name": "Joryes", "discord_id": "374970213503991808", "discord_name": "Joryes"}, {"brawlhalla_id": "9569848", "brawlhalla_name": "1dimensionalbucket", "discord_id": "323796368571367426", "discord_name": "jona55"}, {"brawlhalla_id": "40321889", "brawlhalla_name": "peon", "discord_id": "777930939888173058", "discord_name": "PNX"}, {"brawlhalla_id": "59561496", "brawlhalla_name": "Memory", "discord_id": "312268746095984660", "discord_name": "Sarcasm"}, {"brawlhalla_id": "5503396", "brawlhalla_name": "MRB", "discord_id": "439889501318545418", "discord_name": "Brandon"}, {"brawlhalla_id": "7220395", "brawlhalla_name": "Kami", "discord_id": "392272785902403597", "discord_name": "Tyler<3"}, {"brawlhalla_id": "7294526", "brawlhalla_name": "MG", "discord_id": "312192465002168330", "discord_name": "Panda MG"}, {"brawlhalla_id": "2600667", "brawlhalla_name": "SamiGigi", "discord_id": "148177292831490048", "discord_name": "SamiGigi"}, {"brawlhalla_id": "8275242", "brawlhalla_name": "Jhonny", "discord_id": "251416520322711553", "discord_name": "Jhonny"}, {"brawlhalla_id": "57482158", "brawlhalla_name": "walter white", "discord_id": "689235416334991367", "discord_name": "daddymyers"}, {"brawlhalla_id": "9048248", "brawlhalla_name": "Lil Liser <3", "discord_id": "648264475585019919", "discord_name": "Lil Liser"}, {"brawlhalla_id": "83366016", "brawlhalla_name": "twitch.tv/WhisperBH", "discord_id": "691049223335968870", "discord_name": "SUPER STRONG"}, {"brawlhalla_id": "3764805", "brawlhalla_name": "Lil'Fox <3", "discord_id": "344762518033399809", "discord_name": "Kyouno Natsumi <3"}, {"brawlhalla_id": "42572878", "brawlhalla_name": "xFabio", "discord_id": "233635358791827456", "discord_name": "xFabioh"}, {"brawlhalla_id": "3221385", "brawlhalla_name": "the neutral duck (Eldad)", "discord_id": "265089434398097408", "discord_name": "El Eldad"}, {"brawlhalla_id": "3794093", "brawlhalla_name": "MrEmpanadilla19", "discord_id": "325386848820002836", "discord_name": "MrEmpanadilla19"}, {"brawlhalla_id": "3995547", "brawlhalla_name": "PCS | iiTzHairu!?", "discord_id": "576065425507352607", "discord_name": "Ashuramaru"}, {"brawlhalla_id": "7364605", "brawlhalla_name": "CrossyChainsaw", "discord_id": "413070742591373314", "discord_name": "CrossyChainsaw"}, {"brawlhalla_id": "70022787", "brawlhalla_name": "twitch.tv/ma2st4er5", "discord_id": "711069947530444810", "discord_name": "ma2st4er5"}, {"brawlhalla_id": "79329873", "brawlhalla_name": "ian", "discord_id": "613339572918681641", "discord_name": "ian."}, {"brawlhalla_id": "1892771", "brawlhalla_name": "Vooltex", "discord_id": "536465855329075230", "discord_name": "Vooltex"}, {"brawlhalla_id": "35913608", "brawlhalla_name": "rufus", "discord_id": "509030415496118293", "discord_name": "rufus"}, {"brawlhalla_id": "3565388", "brawlhalla_name": "Excellence", "discord_id": "319204608658636811", "discord_name": "Excellence"}, {"brawlhalla_id": "8830089", "brawlhalla_name": "UnderF\u00c3\u00b8x", "discord_id": "343361847631675404", "discord_name": "UnderFox"}, {"brawlhalla_id": "3615467", "brawlhalla_name": ".", "discord_id": "322658711808114688", "discord_name": "Neru"}, {"brawlhalla_id": "35664307", "brawlhalla_name": "Brawler", "discord_id": "397723268288610304", "discord_name": "yum"}, {"brawlhalla_id": "38970073", "brawlhalla_name": "\u00e2\u0080\u00a0 lovely \u00e1\u0083\u00a6", "discord_id": "397560189273899028", "discord_name": "l o v e l y \u8ff7\u4eba\u7684"}] \ No newline at end of file diff --git a/data_link_Iratus niggas.json b/data_link_Iratus niggas.json index 39ac652..04e4862 100644 --- a/data_link_Iratus niggas.json +++ b/data_link_Iratus niggas.json @@ -1 +1,46 @@ -[{"brawlhalla_id": "61355963", "brawlhalla_name": "chromecast", "discord_id": "746433776929734748", "discord_name": "abzyo"}, {"brawlhalla_id": "28054305", "brawlhalla_name": "gishide", "discord_id": "552032277803302913", "discord_name": "gishide"}, {"brawlhalla_id": "33893717", "brawlhalla_name": "certified keyboard gamer(day 2)", "discord_id": "399163789397983234", "discord_name": "mamamia"}, {"brawlhalla_id": "1509948", "brawlhalla_name": "Just k0sy", "discord_id": "425069446697189381", "discord_name": "JuninZika"}, {"brawlhalla_id": "6261062", "brawlhalla_name": "Disastratis", "discord_id": "361476536139776032", "discord_name": "Disastratis"}, {"brawlhalla_id": "9316238", "brawlhalla_name": "Serendipity", "discord_id": "442041573383995415", "discord_name": "Nymphe!?"}, {"brawlhalla_id": "6244176", "brawlhalla_name": "sukaroo?!", "discord_id": "875447122919567370", "discord_name": "sukaroo"}, {"brawlhalla_id": "49993518", "brawlhalla_name": "rias", "discord_id": "1011032741778837514", "discord_name": "rias"}] \ No newline at end of file +[{ + "brawlhalla_id": "61355963", + "brawlhalla_name": "chromecast", + "discord_id": "746433776929734748", + "discord_name": "abzyo" +}, { + "brawlhalla_id": "28054305", + "brawlhalla_name": "gishide", + "discord_id": "552032277803302913", + "discord_name": "gishide" +}, { + "brawlhalla_id": "33893717", + "brawlhalla_name": "certified keyboard gamer(day 2)", + "discord_id": "399163789397983234", + "discord_name": "mamamia" +}, { + "brawlhalla_id": "1509948", + "brawlhalla_name": "Just k0sy", + "discord_id": "425069446697189381", + "discord_name": "JuninZika" +}, { + "brawlhalla_id": "6261062", + "brawlhalla_name": "Disastratis", + "discord_id": "361476536139776032", + "discord_name": "Disastratis" +}, { + "brawlhalla_id": "9316238", + "brawlhalla_name": "Serendipity", + "discord_id": "442041573383995415", + "discord_name": "Nymphe!?" +}, { + "brawlhalla_id": "6244176", + "brawlhalla_name": "sukaroo?!", + "discord_id": "875447122919567370", + "discord_name": "sukaroo" +}, { + "brawlhalla_id": "49993518", + "brawlhalla_name": "rias", + "discord_id": "1011032741778837514", + "discord_name": "rias" +}, { + "brawlhalla_id": "5920747", + "brawlhalla_name": "\u00ed\u0095\u0098\u00eb\u008a\u0098 | Sky", + "discord_id": "261474491060715520", + "discord_name": "ChrisSkyRo" +}] diff --git a/main.py b/main.py index fd0c9f9..6e36835 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,6 @@ import random from command_link_remove import remove_link from command_waitinglist_list import get_waitinglist_list -import config import discord import os from keep_alive import keep_alive @@ -28,8 +27,11 @@ # ⬇️ STATUS COMMANDS ⬇️ -@has_permissions(ban_members=True) -@bot.command(name='status', aliases=['tatus', 'st', 's'], description='Shows new discord members, new clan members and if people left the clan') +@bot.command( + name='status', + aliases=['tatus', 'st', 's'], + description= + 'Shows new discord members, new clan members and if people left the clan') async def status(ctx): # get and send status (maybe seperate this so no dependency in file) await get_status(ctx, embed_color) @@ -41,14 +43,16 @@ async def status(ctx): @has_permissions(ban_members=True) -@bot.command(name='lsdi', aliases=['lsdc'], description='Show all clan members in discord') +@bot.command(name='lsdi', + aliases=['lsdc'], + description='Show all clan members in discord') async def show_all_discord_members(ctx): # update clan data await ctx.send(await update_discord_data(ctx)) - + # get discord list msg_list = await get_discord_list(ctx) - + # send discord list embed1 = discord.Embed(description=msg_list[0], color=embed_color) embed2 = discord.Embed(description=msg_list[1], color=embed_color) @@ -76,17 +80,19 @@ async def show_all_clan_members(ctx): await ctx.channel.send(embed=embed1) await ctx.channel.send(embed=embed2) + @bot.command(name='upcl', description='Manually updates clan data') async def qsupcl(ctx): - await ctx.channel.send(update_clan_data(ctx)) + await ctx.channel.send(update_clan_data(ctx)) + # ⬇️ LINKING COMMANDS ⬇️ # ⬇️ LINKING COMMANDS ⬇️ # ⬇️ LINKING COMMANDS ⬇️ -@bot.command(name='rmli', description='Remove a discord-brawlhalla link') @has_permissions(ban_members=True) +@bot.command(name='rmli', description='Remove a discord-brawlhalla link') async def rmli(ctx, brawlhalla_id): # remove link from link list await remove_link(brawlhalla_id, bot, ctx) @@ -105,10 +111,10 @@ async def missing_question(ctx, error): async def list_link(ctx): # update link list embed_name_changes = update_links(ctx, embed_color) - + # get link list msg_list = await get_link_list(ctx) - + # send link list embed1 = discord.Embed(description=msg_list[0], color=embed_color) embed2 = discord.Embed(description=msg_list[1], color=embed_color) @@ -122,10 +128,15 @@ async def list_link(ctx): await ctx.channel.send(embed=embed_name_changes) -@bot.command(name='adli', aliases=['addli', 'ali'], description='Create a link between a discord and brawlhalla account') +@has_permissions(ban_members=True) +@bot.command( + name='adli', + aliases=['addli', 'ali'], + description='Create a link between a discord and brawlhalla account') async def qsadli(ctx, brawlhalla_id, discord_id): - # adds a link to link list - await add_link(bot, ctx, brawlhalla_id, discord_id, embed_color) + # adds a link to link list + await add_link(bot, ctx, brawlhalla_id, discord_id, embed_color) + @qsadli.error async def missing_question(ctx, error): @@ -134,7 +145,9 @@ async def missing_question(ctx, error): 'format your message like the following\n`qsadli brawlhalla_id discord_id`' ) -@bot.command(name='upli', description='manually updates all old brawlhalla names in links') + +@bot.command(name='upli', + description='manually updates all old brawlhalla names in links') async def upli(ctx): await ctx.channel.send(embed=update_links(ctx, embed_color)) @@ -183,7 +196,9 @@ async def meme(ctx): await ctx.channel.send(meme) -@bot.command(name='doc', aliases=['docs'], description="Send you to the GitHub page") +@bot.command(name='doc', + aliases=['docs'], + description="Send you to the GitHub page") async def doc(ctx): await ctx.channel.send( 'Queen Spy Documentation -> https://github.com/CrossyChainsaw/Queen-Spy' @@ -192,4 +207,3 @@ async def doc(ctx): keep_alive() bot.run(os.environ['BOT_KEY']) -#keepAlive(bot) \ No newline at end of file