Merge pull request #51 from Skyward-Brawlhalla/update-links

Fix #41
CrossyChainsaw · Sep 4, 2022 · d5c7447 · d5c7447
2 parents 3d89e80 + e27ea5e
commit d5c7447
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 10 deletions.
diff --git a/__pycache__/api.cpython-38.pyc b/__pycache__/api.cpython-38.pyc
diff --git a/__pycache__/command_discord_update.cpython-38.pyc b/__pycache__/command_discord_update.cpython-38.pyc
diff --git a/__pycache__/command_link_list.cpython-38.pyc b/__pycache__/command_link_list.cpython-38.pyc
diff --git a/__pycache__/command_link_remove.cpython-38.pyc b/__pycache__/command_link_remove.cpython-38.pyc
diff --git a/__pycache__/command_link_update.cpython-38.pyc b/__pycache__/command_link_update.cpython-38.pyc
diff --git a/api.py b/api.py
@@ -9,6 +9,7 @@
 lilly_clan_id = '864398'
 poopy_blender_clan_id = '1923622'
 dair_clan_id = '1357965'
+blossom_clan_id = '1788477'
 
 
 def clan_request(ctx):
@@ -21,3 +22,5 @@ def set_using_clan(ctx):
     return skyward_clan_id
   elif ctx.guild.name == "Dair":
     return dair_clan_id
+  elif ctx.guild.name == "🌸Blossom🌸":
+    return blossom_clan_id
diff --git a/command_discord_update.py b/command_discord_update.py
@@ -12,6 +12,8 @@ async def update_discord_data(ctx):
       clan_member_role_name = '💧 Dair 💧'
     elif ctx.guild.name == "Skyward":
       clan_member_role_name = 'Clan Member'
+    elif ctx.guild.name == "🌸Blossom🌸":
+      clan_member_role_name = "Blossom"
     guild = ctx.guild
     msg = ''
     num = 1

diff --git a/command_link_list.py b/command_link_list.py
@@ -1,6 +1,10 @@
 import json
 import discord
 
+# todo
+# get all clan member names
+# replace all current clan member names in link list
+
 
 async def get_link_list(ctx):
     with open('./data_link_'+ctx.guild.name+'.json') as f:

diff --git a/command_link_remove.py b/command_link_remove.py
@@ -10,7 +10,7 @@ async def remove_link(brawlhalla_id, bot, ctx):
         link_data = json.load(f)
     num = 0
     for link in link_data:
-        if str(link['brawlhalla_id']) == str(brawlhalla_id) or str(link['brawlhalla_id'])[0:4:1] == str(brawlhalla_id)[0:4:1]:
+        if str(link['brawlhalla_id']) == str(brawlhalla_id) or str(link['brawlhalla_id'])[0:3:1] == str(brawlhalla_id)[0:3:1]:
             await ctx.send('Are you sure you want to delete the following link?')
             embed1 = discord.Embed(
                 description='**brawlhalla_id**: ' + str(link_data[num]['brawlhalla_id']) + '\n' +

diff --git a/command_link_update.py b/command_link_update.py
@@ -0,0 +1,43 @@
+import json
+
+# todo
+# get link list data
+# get clan member data
+# in link list replace clan member name with clan member data names
+
+class User:
+    def __init__(self, brawlhalla_id, brawlhalla_name, discord_id,
+                 discord_name):
+        self.brawlhalla_id = brawlhalla_id
+        self.brawlhalla_name = brawlhalla_name
+        self.discord_id = discord_id
+        self.discord_name = discord_name
+
+def update_links(ctx):
+  # get link list
+  with open('./data_link_'+ctx.guild.name+'.json') as f1:
+    link_data = json.load(f1)
+  # get clan list
+  with open('./data_clan_'+ctx.guild.name+'.json') as f2:
+    clan_data = json.load(f2)
+
+  link_data_new = []  
+  # in link list replace clan member name with clan member data names
+  for account in link_data:
+    for clan_member in clan_data['clan']:
+      if str(account['brawlhalla_id']) == str(clan_member['brawlhalla_id']):
+        if account['brawlhalla_name'] != clan_member['name']:
+          print('old name: ' + account['brawlhalla_name'])
+          print('new name: ' + clan_member['name'])
+          account['brawlhalla_name'] = clan_member['name']
+          #link_data_new.append(account)
+        break
+    #link_data_new.append(account)
+  #print(link_data_new)
+  link_data_new = link_data
+  with open('./data_link_' + ctx.guild.name + '.json', 'w') as f:
+    json.dump(link_data_new, f)
+  msg = 'Updated Dair Link Data' 
+  return msg
+
+
diff --git a/data_clan_Dair.json b/data_clan_Dair.json
@@ -1 +1 @@
-{"clan_id": 1357965, "clan_name": "Dair", "clan_create_date": 1609151553, "clan_xp": "1496595", "clan": [{"brawlhalla_id": 6746620, "name": "sgrape", "rank": "Leader", "join_date": 1656780578, "xp": 35396}, {"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": 20584}, {"brawlhalla_id": 24664406, "name": "Rimuru", "rank": "Member", "join_date": 1656792002, "xp": 20012}, {"brawlhalla_id": 27930713, "name": "Madison", "rank": "Member", "join_date": 1656840626, "xp": 24160}, {"brawlhalla_id": 35664307, "name": "yum", "rank": "Member", "join_date": 1656842131, "xp": 41631}, {"brawlhalla_id": 59561496, "name": "Memory", "rank": "Member", "join_date": 1656848208, "xp": 35567}, {"brawlhalla_id": 29109995, "name": "SiLver", "rank": "Member", "join_date": 1656857493, "xp": 21644}, {"brawlhalla_id": 34242870, "name": "$now?!", "rank": "Member", "join_date": 1656864319, "xp": 72910}, {"brawlhalla_id": 43401640, "name": "FuuuX", "rank": "Member", "join_date": 1656873217, "xp": 27942}, {"brawlhalla_id": 8948682, "name": "La Planta", "rank": "Member", "join_date": 1656875188, "xp": 27357}, {"brawlhalla_id": 7974814, "name": "ZAW;", "rank": "Member", "join_date": 1656880761, "xp": 20809}, {"brawlhalla_id": 9569848, "name": "1dimensionalbucket", "rank": "Member", "join_date": 1656883554, "xp": 14486}, {"brawlhalla_id": 35710376, "name": "Camila.", "rank": "Member", "join_date": 1656945111, "xp": 4050}, {"brawlhalla_id": 3711805, "name": "flower", "rank": "Member", "join_date": 1656968084, "xp": 33899}, {"brawlhalla_id": 454666, "name": "Zabulon", "rank": "Member", "join_date": 1657047191, "xp": 18789}, {"brawlhalla_id": 57482158, "name": "walter white", "rank": "Member", "join_date": 1657053675, "xp": 29028}, {"brawlhalla_id": 7142017, "name": "Julian", "rank": "Member", "join_date": 1657123140, "xp": 24476}, {"brawlhalla_id": 40321889, "name": "peon", "rank": "Member", "join_date": 1657370066, "xp": 40610}, {"brawlhalla_id": 5671092, "name": "Skeldra", "rank": "Member", "join_date": 1657473993, "xp": 18148}, {"brawlhalla_id": 9626815, "name": "Rasdos", "rank": "Member", "join_date": 1657476377, "xp": 45523}, {"brawlhalla_id": 830910, "name": "Dagmar <3", "rank": "Officer", "join_date": 1657568746, "xp": 33763}, {"brawlhalla_id": 7220395, "name": "Kami", "rank": "Member", "join_date": 1657578939, "xp": 19211}, {"brawlhalla_id": 9070717, "name": "TragicX7", "rank": "Member", "join_date": 1657581252, "xp": 15352}, {"brawlhalla_id": 7846170, "name": "Joryes", "rank": "Member", "join_date": 1657615456, "xp": 17805}, {"brawlhalla_id": 7294526, "name": "MG", "rank": "Member", "join_date": 1658169785, "xp": 29651}, {"brawlhalla_id": 10352807, "name": "Doku", "rank": "Member", "join_date": 1658170826, "xp": 14807}, {"brawlhalla_id": 8275242, "name": "Jhonny", "rank": "Member", "join_date": 1658174887, "xp": 21695}, {"brawlhalla_id": 5503396, "name": "MRB", "rank": "Member", "join_date": 1658345270, "xp": 36640}, {"brawlhalla_id": 7159263, "name": "PCS | Shadra - Baguette senpai", "rank": "Member", "join_date": 1658395590, "xp": 29891}, {"brawlhalla_id": 3013356, "name": "oszcar", "rank": "Member", "join_date": 1658856944, "xp": 57264}, {"brawlhalla_id": 2600667, "name": "SamiGigi", "rank": "Member", "join_date": 1658948471, "xp": 9464}, {"brawlhalla_id": 69630716, "name": "sH", "rank": "Member", "join_date": 1659274583, "xp": 63825}, {"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": 15353}, {"brawlhalla_id": 5111230, "name": "WelFe", "rank": "Member", "join_date": 1660938600, "xp": 7387}, {"brawlhalla_id": 7364605, "name": "CrossyChainsaw", "rank": "Member", "join_date": 1660940056, "xp": 6307}, {"brawlhalla_id": 26417667, "name": "Dobleh #Lidia", "rank": "Member", "join_date": 1660940976, "xp": 6885}, {"brawlhalla_id": 9048248, "name": "Lil Liser <3", "rank": "Member", "join_date": 1660989573, "xp": 4781}, {"brawlhalla_id": 83366016, "name": "twitch.tv/WhisperBH", "rank": "Member", "join_date": 1661004909, "xp": 11440}, {"brawlhalla_id": 1209176, "name": "PKMN Trainer Red", "rank": "Member", "join_date": 1661021682, "xp": 7895}, {"brawlhalla_id": 3764805, "name": "Lil'Fox <3", "rank": "Member", "join_date": 1661104096, "xp": 7338}, {"brawlhalla_id": 3794093, "name": "MrEmpanadilla19", "rank": "Member", "join_date": 1661640242, "xp": 11765}, {"brawlhalla_id": 3995547, "name": "iiTzHairu!?", "rank": "Member", "join_date": 1661858269, "xp": 2153}, {"brawlhalla_id": 3221385, "name": "the neutral duck (Eldad)", "rank": "Member", "join_date": 1661870719, "xp": 2491}, {"brawlhalla_id": 42572878, "name": "xFabio", "rank": "Member", "join_date": 1661871499, "xp": 3847}, {"brawlhalla_id": 79329873, "name": "ian", "rank": "Member", "join_date": 1662154023, "xp": 750}, {"brawlhalla_id": 1892771, "name": "Vooltex", "rank": "Member", "join_date": 1662154025, "xp": 245}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1662208545, "xp": 65}]}
+{"clan_id": 1357965, "clan_name": "Dair", "clan_create_date": 1609151553, "clan_xp": "1507360", "clan": [{"brawlhalla_id": 6746620, "name": "sgrape", "rank": "Leader", "join_date": 1656780578, "xp": 35522}, {"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": 21996}, {"brawlhalla_id": 24664406, "name": "Drunk boy", "rank": "Member", "join_date": 1656792002, "xp": 20838}, {"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": 42445}, {"brawlhalla_id": 59561496, "name": "Memory", "rank": "Member", "join_date": 1656848208, "xp": 35769}, {"brawlhalla_id": 29109995, "name": "SiLver", "rank": "Member", "join_date": 1656857493, "xp": 21644}, {"brawlhalla_id": 34242870, "name": "cat gang | $now?!", "rank": "Member", "join_date": 1656864319, "xp": 73812}, {"brawlhalla_id": 43401640, "name": "FuuuX", "rank": "Member", "join_date": 1656873217, "xp": 28169}, {"brawlhalla_id": 8948682, "name": "La Planta", "rank": "Member", "join_date": 1656875188, "xp": 27357}, {"brawlhalla_id": 7974814, "name": "ZAW;", "rank": "Member", "join_date": 1656880761, "xp": 21000}, {"brawlhalla_id": 9569848, "name": "1dimensionalbucket", "rank": "Member", "join_date": 1656883554, "xp": 14576}, {"brawlhalla_id": 35710376, "name": "Camila.", "rank": "Member", "join_date": 1656945111, "xp": 4050}, {"brawlhalla_id": 3711805, "name": "flower", "rank": "Member", "join_date": 1656968084, "xp": 33899}, {"brawlhalla_id": 454666, "name": "Zabulon", "rank": "Member", "join_date": 1657047191, "xp": 19194}, {"brawlhalla_id": 57482158, "name": "walter white", "rank": "Member", "join_date": 1657053675, "xp": 29028}, {"brawlhalla_id": 7142017, "name": "Julian", "rank": "Member", "join_date": 1657123140, "xp": 24720}, {"brawlhalla_id": 40321889, "name": "peon", "rank": "Member", "join_date": 1657370066, "xp": 41319}, {"brawlhalla_id": 5671092, "name": "Skeldra", "rank": "Member", "join_date": 1657473993, "xp": 18148}, {"brawlhalla_id": 9626815, "name": "Rasdos", "rank": "Member", "join_date": 1657476377, "xp": 45932}, {"brawlhalla_id": 830910, "name": "Dagmar <3", "rank": "Officer", "join_date": 1657568746, "xp": 33763}, {"brawlhalla_id": 7220395, "name": "Kami", "rank": "Member", "join_date": 1657578939, "xp": 19211}, {"brawlhalla_id": 9070717, "name": "TragicX7", "rank": "Member", "join_date": 1657581252, "xp": 15352}, {"brawlhalla_id": 7846170, "name": "Joryes", "rank": "Member", "join_date": 1657615456, "xp": 17805}, {"brawlhalla_id": 7294526, "name": "MG", "rank": "Member", "join_date": 1658169785, "xp": 29651}, {"brawlhalla_id": 10352807, "name": "Doku", "rank": "Member", "join_date": 1658170826, "xp": 14807}, {"brawlhalla_id": 8275242, "name": "Jhonny", "rank": "Member", "join_date": 1658174887, "xp": 21695}, {"brawlhalla_id": 5503396, "name": "MRB", "rank": "Member", "join_date": 1658345270, "xp": 36640}, {"brawlhalla_id": 7159263, "name": "PCS | Shadra - Baguette senpai", "rank": "Member", "join_date": 1658395590, "xp": 29891}, {"brawlhalla_id": 3013356, "name": "oszcar", "rank": "Member", "join_date": 1658856944, "xp": 57592}, {"brawlhalla_id": 2600667, "name": "SamiGigi", "rank": "Member", "join_date": 1658948471, "xp": 9615}, {"brawlhalla_id": 69630716, "name": "cat gang | sH", "rank": "Member", "join_date": 1659274583, "xp": 64636}, {"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": 15739}, {"brawlhalla_id": 5111230, "name": "WelFe", "rank": "Member", "join_date": 1660938600, "xp": 7938}, {"brawlhalla_id": 7364605, "name": "CrossyChainsaw", "rank": "Member", "join_date": 1660940056, "xp": 6372}, {"brawlhalla_id": 26417667, "name": "Dobleh #Lidia", "rank": "Member", "join_date": 1660940976, "xp": 7757}, {"brawlhalla_id": 9048248, "name": "Lil Liser <3", "rank": "Member", "join_date": 1660989573, "xp": 4781}, {"brawlhalla_id": 83366016, "name": "twitch.tv/WhisperBH", "rank": "Member", "join_date": 1661004909, "xp": 11440}, {"brawlhalla_id": 1209176, "name": "cat gang | woop!?", "rank": "Member", "join_date": 1661021682, "xp": 7895}, {"brawlhalla_id": 3764805, "name": "Lil'Fox <3", "rank": "Member", "join_date": 1661104096, "xp": 7338}, {"brawlhalla_id": 3794093, "name": "MrEmpanadilla19", "rank": "Member", "join_date": 1661640242, "xp": 12435}, {"brawlhalla_id": 3995547, "name": "iiTzHairu!?", "rank": "Member", "join_date": 1661858269, "xp": 2153}, {"brawlhalla_id": 3221385, "name": "the neutral duck (Eldad)", "rank": "Member", "join_date": 1661870719, "xp": 2700}, {"brawlhalla_id": 42572878, "name": "xFabio", "rank": "Member", "join_date": 1661871499, "xp": 4012}, {"brawlhalla_id": 79329873, "name": "ian", "rank": "Member", "join_date": 1662154023, "xp": 750}, {"brawlhalla_id": 1892771, "name": "Vooltex", "rank": "Member", "join_date": 1662154025, "xp": 245}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1662208545, "xp": 65}]}