Merge pull request #52 from Skyward-Brawlhalla/add-another-clan

Add Iratus clan. Bug Fixes. Update Doc.

api.py

@@ -10,6 +10,7 @@
 poopy_blender_clan_id = '1923622'
 dair_clan_id = '1357965'
 blossom_clan_id = '1788477'
+Iratus_id = '1998475'
 
 
 def clan_request(ctx):
@@ -24,3 +25,5 @@ def set_using_clan(ctx):
     return dair_clan_id
   elif ctx.guild.name == "🌸Blossom🌸":
     return blossom_clan_id
+  elif ctx.guild.name == "Iratus niggas":
+    return Iratus_id

command_discord_update.py

@@ -14,6 +14,8 @@ async def update_discord_data(ctx):
       clan_member_role_name = 'Clan Member'
     elif ctx.guild.name == "🌸Blossom🌸":
       clan_member_role_name = "Blossom"
+    elif ctx.guild.name == "Iratus niggas":
+      clan_member_role_name = "Clan Member"
     guild = ctx.guild
     msg = ''
     num = 1

command_link_update.py

@@ -1,4 +1,5 @@
 import json
+import discord
 
 # todo
 # get link list data
@@ -13,31 +14,34 @@ def __init__(self, brawlhalla_id, brawlhalla_name, discord_id,
         self.discord_id = discord_id
         self.discord_name = discord_name
 
-def update_links(ctx):
+def update_links(ctx, embed_color):
   # 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)
 
+  embed = discord.Embed(title='Name Changes', description='', color=embed_color)
+
   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'])
+          embed.description += '**old_name**: ' + account['brawlhalla_name']+'\n'
+          embed.description += '**new_name**: ' + clan_member['name'] + '\n'
+          embed.description += '\n'
           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
+  # overwrite old data with new 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
+  # check if embed is empty
+  if len(embed.description) == 0:
+    embed.description += 'there were no new name changes'
+  return embed
 
 

data_clan_Iratus niggas.json

@@ -0,0 +1 @@
+{"clan_id": 1998475, "clan_name": "Iratus", "clan_create_date": 1662159711, "clan_xp": "9461", "clan": [{"brawlhalla_id": 28054305, "name": "gishide", "rank": "Leader", "join_date": 1662159807, "xp": 697}, {"brawlhalla_id": 61355963, "name": "chromecast", "rank": "Officer", "join_date": 1662160170, "xp": 1182}, {"brawlhalla_id": 9316238, "name": "Serendipity", "rank": "Officer", "join_date": 1662160201, "xp": 1427}, {"brawlhalla_id": 33893717, "name": "certified keyboard gamer(day 2)", "rank": "Member", "join_date": 1662160289, "xp": 1536}, {"brawlhalla_id": 6261062, "name": "Disastratis", "rank": "Member", "join_date": 1662160748, "xp": 0}, {"brawlhalla_id": 1509948, "name": "Just k0sy", "rank": "Member", "join_date": 1662164345, "xp": 383}, {"brawlhalla_id": 6244176, "name": "sukaroo?!", "rank": "Member", "join_date": 1662226618, "xp": 4236}]}

data_clan_Skyward.json

@@ -1 +1 @@
-{"clan_id": 84648, "clan_name": "Skyward", "clan_create_date": 1469763610, "clan_xp": "14741657", "clan": [{"brawlhalla_id": 6433263, "name": "Zwergennest", "rank": "Member", "join_date": 1618333318, "xp": 241267}, {"brawlhalla_id": 49936771, "name": "Hunter", "rank": "Officer", "join_date": 1618949986, "xp": 592901}, {"brawlhalla_id": 71428893, "name": "zDisigma", "rank": "Member", "join_date": 1631063079, "xp": 251289}, {"brawlhalla_id": 6202261, "name": "Linox", "rank": "Member", "join_date": 1633609381, "xp": 244555}, {"brawlhalla_id": 8615459, "name": "Hidetsu?!", "rank": "Member", "join_date": 1644348435, "xp": 58911}, {"brawlhalla_id": 43227947, "name": "Mogzy", "rank": "Member", "join_date": 1646239755, "xp": 56374}, {"brawlhalla_id": 26358569, "name": "Uncle Timmy", "rank": "Member", "join_date": 1646239982, "xp": 65298}, {"brawlhalla_id": 74662063, "name": "Roddd", "rank": "Leader", "join_date": 1647024356, "xp": 28167}, {"brawlhalla_id": 84499165, "name": "Kaizaar", "rank": "Member", "join_date": 1649621274, "xp": 68300}, {"brawlhalla_id": 2658232, "name": "gonconist", "rank": "Member", "join_date": 1650631486, "xp": 14671}, {"brawlhalla_id": 40660695, "name": "twitch.tv/friendlyherobrn", "rank": "Member", "join_date": 1653504781, "xp": 59538}, {"brawlhalla_id": 47231784, "name": "Fochino", "rank": "Member", "join_date": 1653659995, "xp": 34957}, {"brawlhalla_id": 9317622, "name": "Hitaku", "rank": "Member", "join_date": 1653661551, "xp": 7177}, {"brawlhalla_id": 10202957, "name": "Kolibric", "rank": "Member", "join_date": 1653863883, "xp": 18705}, {"brawlhalla_id": 54509175, "name": "RicoDelPablo", "rank": "Member", "join_date": 1653863893, "xp": 61493}, {"brawlhalla_id": 56177224, "name": "EvilGaming69", "rank": "Member", "join_date": 1654464708, "xp": 32508}, {"brawlhalla_id": 2148597, "name": "Guffe", "rank": "Member", "join_date": 1654515637, "xp": 10021}, {"brawlhalla_id": 54489626, "name": "RealPordenone728", "rank": "Member", "join_date": 1654696669, "xp": 14365}, {"brawlhalla_id": 3577224, "name": "Zerk", "rank": "Member", "join_date": 1654950412, "xp": 35438}, {"brawlhalla_id": 42952335, "name": "Domagoj_playz", "rank": "Member", "join_date": 1655117007, "xp": 32736}, {"brawlhalla_id": 24642609, "name": "Marwini", "rank": "Member", "join_date": 1655138202, "xp": 27888}, {"brawlhalla_id": 79985611, "name": "klopj", "rank": "Member", "join_date": 1655656388, "xp": 4214}, {"brawlhalla_id": 55666789, "name": "bring me the horizon", "rank": "Member", "join_date": 1655713688, "xp": 17347}, {"brawlhalla_id": 7124064, "name": "woven", "rank": "Member", "join_date": 1657367800, "xp": 8642}, {"brawlhalla_id": 39794122, "name": "Dex", "rank": "Member", "join_date": 1658439015, "xp": 11003}, {"brawlhalla_id": 56793941, "name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "rank": "Member", "join_date": 1659878282, "xp": 22201}, {"brawlhalla_id": 1042492, "name": "Nin", "rank": "Member", "join_date": 1660216439, "xp": 3362}, {"brawlhalla_id": 8774115, "name": "\u00f0\u009f\u008c\u009fpolar bear", "rank": "Member", "join_date": 1661433540, "xp": 9367}, {"brawlhalla_id": 3038693, "name": "e n e r g y z ?", "rank": "Member", "join_date": 1661524659, "xp": 12517}, {"brawlhalla_id": 71629540, "name": "space", "rank": "Member", "join_date": 1661687066, "xp": 5133}]}
+{"clan_id": 84648, "clan_name": "Skyward", "clan_create_date": 1469763610, "clan_xp": "14742592", "clan": [{"brawlhalla_id": 6433263, "name": "Zwergennest", "rank": "Member", "join_date": 1618333318, "xp": 241267}, {"brawlhalla_id": 49936771, "name": "Hunter", "rank": "Officer", "join_date": 1618949986, "xp": 593447}, {"brawlhalla_id": 71428893, "name": "zDisigma", "rank": "Member", "join_date": 1631063079, "xp": 251289}, {"brawlhalla_id": 6202261, "name": "Linox", "rank": "Member", "join_date": 1633609381, "xp": 244555}, {"brawlhalla_id": 8615459, "name": "Hidetsu?!", "rank": "Member", "join_date": 1644348435, "xp": 58911}, {"brawlhalla_id": 43227947, "name": "Mogzy", "rank": "Member", "join_date": 1646239755, "xp": 56374}, {"brawlhalla_id": 26358569, "name": "Uncle Timmy", "rank": "Member", "join_date": 1646239982, "xp": 65298}, {"brawlhalla_id": 74662063, "name": "Roddd", "rank": "Leader", "join_date": 1647024356, "xp": 28167}, {"brawlhalla_id": 84499165, "name": "Kaizaar", "rank": "Member", "join_date": 1649621274, "xp": 68300}, {"brawlhalla_id": 2658232, "name": "gonconist", "rank": "Member", "join_date": 1650631486, "xp": 14671}, {"brawlhalla_id": 40660695, "name": "twitch.tv/friendlyherobrn", "rank": "Member", "join_date": 1653504781, "xp": 59538}, {"brawlhalla_id": 47231784, "name": "Fochino", "rank": "Member", "join_date": 1653659995, "xp": 34957}, {"brawlhalla_id": 9317622, "name": "Hitaku", "rank": "Member", "join_date": 1653661551, "xp": 7177}, {"brawlhalla_id": 10202957, "name": "Kolibric", "rank": "Member", "join_date": 1653863883, "xp": 18705}, {"brawlhalla_id": 54509175, "name": "RicoDelPablo", "rank": "Member", "join_date": 1653863893, "xp": 61493}, {"brawlhalla_id": 56177224, "name": "EvilGaming69", "rank": "Member", "join_date": 1654464708, "xp": 32508}, {"brawlhalla_id": 2148597, "name": "Guffe", "rank": "Member", "join_date": 1654515637, "xp": 10021}, {"brawlhalla_id": 54489626, "name": "RealPordenone728", "rank": "Member", "join_date": 1654696669, "xp": 14365}, {"brawlhalla_id": 3577224, "name": "Zerk", "rank": "Member", "join_date": 1654950412, "xp": 35438}, {"brawlhalla_id": 42952335, "name": "Domagoj_playz", "rank": "Member", "join_date": 1655117007, "xp": 32736}, {"brawlhalla_id": 24642609, "name": "Marwini", "rank": "Member", "join_date": 1655138202, "xp": 27888}, {"brawlhalla_id": 79985611, "name": "klopj", "rank": "Member", "join_date": 1655656388, "xp": 4214}, {"brawlhalla_id": 55666789, "name": "bring me the horizon", "rank": "Member", "join_date": 1655713688, "xp": 17347}, {"brawlhalla_id": 7124064, "name": "woven", "rank": "Member", "join_date": 1657367800, "xp": 8642}, {"brawlhalla_id": 39794122, "name": "Dex", "rank": "Member", "join_date": 1658439015, "xp": 11003}, {"brawlhalla_id": 56793941, "name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "rank": "Member", "join_date": 1659878282, "xp": 22590}, {"brawlhalla_id": 1042492, "name": "Nin", "rank": "Member", "join_date": 1660216439, "xp": 3362}, {"brawlhalla_id": 8774115, "name": "\u00f0\u009f\u008c\u009fpolar bear", "rank": "Member", "join_date": 1661433540, "xp": 9367}, {"brawlhalla_id": 3038693, "name": "e n e r g y z ?", "rank": "Member", "join_date": 1661524659, "xp": 12517}, {"brawlhalla_id": 71629540, "name": "space", "rank": "Member", "join_date": 1661687066, "xp": 5133}]}

data_discord_Iratus niggas.json

@@ -0,0 +1 @@
+[{"id": 361476536139776032, "name": "Disastratis"}, {"id": 399163789397983234, "name": "mamamia"}, {"id": 425069446697189381, "name": "JuninZika"}, {"id": 442041573383995415, "name": "Nymphe!?"}, {"id": 552032277803302913, "name": "gishide"}, {"id": 746433776929734748, "name": "abzyo"}]

data_link_Iratus niggas.json

@@ -0,0 +1 @@
+[{"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!?"}]

data_link_Skyward.json

@@ -1 +1 @@
-[{"brawlhalla_id": "49936771", "brawlhalla_name": "Hunter", "discord_id": "541893326874345483", "discord_name": "hunterX"}, {"brawlhalla_id": "6202261", "brawlhalla_name": "Linox", "discord_id": "323167164142190593", "discord_name": "Linox"}, {"brawlhalla_id": "54509175", "brawlhalla_name": "RicoDelPablo!?", "discord_id": "345655312126312448", "discord_name": "RicoDelPablo"}, {"brawlhalla_id": "55666789", "brawlhalla_name": "arigato?", "discord_id": "950741489783287889", "discord_name": "arigato?"}, {"brawlhalla_id": "71428893", "brawlhalla_name": "zDisigma", "discord_id": "661163149067550731", "discord_name": "zDisigma"}, {"brawlhalla_id": "54489626", "brawlhalla_name": "Yami_ThomBozz", "discord_id": "818465649671274497", "discord_name": "Yami_ThomBozz"}, {"brawlhalla_id": "9317622", "brawlhalla_name": "Hitaku", "discord_id": "316650709456257044", "discord_name": "Hitaku"}, {"brawlhalla_id": "42952335", "brawlhalla_name": "Domagoj_playz", "discord_id": "553716871011106828", "discord_name": "Domagoj_playz"}, {"brawlhalla_id": "2148597", "brawlhalla_name": "Guffe", "discord_id": "112578107961004032", "discord_name": "Guffe"}, {"brawlhalla_id": "26358569", "brawlhalla_name": "Uncle Timmy", "discord_id": "781919783863320577", "discord_name": "\u2325|Uncle Timmy \u1d3f\u1d49\u1da0\u1da6\u1d4d\u02b0"}, {"brawlhalla_id": "84499165", "brawlhalla_name": "Kaizaar", "discord_id": "885945279977766943", "discord_name": "Kaizaar"}, {"brawlhalla_id": "24642609", "brawlhalla_name": "Marwini", "discord_id": "338392704780075018", "discord_name": "Marwini"}, {"brawlhalla_id": "3577224", "brawlhalla_name": "Zerk", "discord_id": "348134735110995988", "discord_name": "Zerk"}, {"brawlhalla_id": "74662063", "brawlhalla_name": "Roddd", "discord_id": "973613125381275739", "discord_name": "RoD"}, {"brawlhalla_id": "47231784", "brawlhalla_name": "Fochino", "discord_id": "777204277231616020", "discord_name": "Fochino"}, {"brawlhalla_id": "8615459", "brawlhalla_name": "Hidetsu?!", "discord_id": "286891632756785163", "discord_name": "Hidetsu"}, {"brawlhalla_id": "10202957", "brawlhalla_name": "Kolibric", "discord_id": "557666598853279744", "discord_name": "Kolibric"}, {"brawlhalla_id": "79985611", "brawlhalla_name": "klopj", "discord_id": "327058100332789760", "discord_name": "klopj"}, {"brawlhalla_id": "56177224", "brawlhalla_name": "EvilGaming69", "discord_id": "295944859032748034", "discord_name": "EvilGaming69"}, {"brawlhalla_id": "40660695", "brawlhalla_name": "Friendlyherobrn", "discord_id": "303636140374884361", "discord_name": "Friendlyherobrn"}, {"brawlhalla_id": "2658232", "brawlhalla_name": "gonconist", "discord_id": "341887887995961346", "discord_name": "gonconist"}, {"brawlhalla_id": "43227947", "brawlhalla_name": "victimised AQUA", "discord_id": "645442530577612810", "discord_name": "AQUA"}, {"brawlhalla_id": "6433263", "brawlhalla_name": "Zwergennest", "discord_id": "386956936517648384", "discord_name": "Zwergennest"}, {"brawlhalla_id": "7124064", "brawlhalla_name": "woven", "discord_id": "129253606544113664", "discord_name": "Woven"}, {"brawlhalla_id": "39794122", "brawlhalla_name": "Dex", "discord_id": "357148393115746304", "discord_name": "Dex"}, {"brawlhalla_id": "56793941", "brawlhalla_name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "discord_id": "507524066840674312", "discord_name": "Fighter22"}, {"brawlhalla_id": "1042492", "brawlhalla_name": "Nin", "discord_id": "823299784378548264", "discord_name": "NinGotYou"}, {"brawlhalla_id": "8774115", "brawlhalla_name": "\u00f0\u009f\u008c\u009fpolar bear", "discord_id": "956341910761513000", "discord_name": "nik."}, {"brawlhalla_id": "3038693", "brawlhalla_name": "e n e r g y z ?", "discord_id": "246017232230940673", "discord_name": "energyz"}]
+[{"brawlhalla_id": "49936771", "brawlhalla_name": "Hunter", "discord_id": "541893326874345483", "discord_name": "hunterX"}, {"brawlhalla_id": "6202261", "brawlhalla_name": "Linox", "discord_id": "323167164142190593", "discord_name": "Linox"}, {"brawlhalla_id": "54509175", "brawlhalla_name": "RicoDelPablo", "discord_id": "345655312126312448", "discord_name": "RicoDelPablo"}, {"brawlhalla_id": "55666789", "brawlhalla_name": "bring me the horizon", "discord_id": "950741489783287889", "discord_name": "arigato?"}, {"brawlhalla_id": "71428893", "brawlhalla_name": "zDisigma", "discord_id": "661163149067550731", "discord_name": "zDisigma"}, {"brawlhalla_id": "54489626", "brawlhalla_name": "RealPordenone728", "discord_id": "818465649671274497", "discord_name": "Yami_ThomBozz"}, {"brawlhalla_id": "9317622", "brawlhalla_name": "Hitaku", "discord_id": "316650709456257044", "discord_name": "Hitaku"}, {"brawlhalla_id": "42952335", "brawlhalla_name": "Domagoj_playz", "discord_id": "553716871011106828", "discord_name": "Domagoj_playz"}, {"brawlhalla_id": "2148597", "brawlhalla_name": "Guffe", "discord_id": "112578107961004032", "discord_name": "Guffe"}, {"brawlhalla_id": "26358569", "brawlhalla_name": "Uncle Timmy", "discord_id": "781919783863320577", "discord_name": "\u2325|Uncle Timmy \u1d3f\u1d49\u1da0\u1da6\u1d4d\u02b0"}, {"brawlhalla_id": "84499165", "brawlhalla_name": "Kaizaar", "discord_id": "885945279977766943", "discord_name": "Kaizaar"}, {"brawlhalla_id": "24642609", "brawlhalla_name": "Marwini", "discord_id": "338392704780075018", "discord_name": "Marwini"}, {"brawlhalla_id": "3577224", "brawlhalla_name": "Zerk", "discord_id": "348134735110995988", "discord_name": "Zerk"}, {"brawlhalla_id": "74662063", "brawlhalla_name": "Roddd", "discord_id": "973613125381275739", "discord_name": "RoD"}, {"brawlhalla_id": "47231784", "brawlhalla_name": "Fochino", "discord_id": "777204277231616020", "discord_name": "Fochino"}, {"brawlhalla_id": "8615459", "brawlhalla_name": "Hidetsu?!", "discord_id": "286891632756785163", "discord_name": "Hidetsu"}, {"brawlhalla_id": "10202957", "brawlhalla_name": "Kolibric", "discord_id": "557666598853279744", "discord_name": "Kolibric"}, {"brawlhalla_id": "79985611", "brawlhalla_name": "klopj", "discord_id": "327058100332789760", "discord_name": "klopj"}, {"brawlhalla_id": "56177224", "brawlhalla_name": "EvilGaming69", "discord_id": "295944859032748034", "discord_name": "EvilGaming69"}, {"brawlhalla_id": "40660695", "brawlhalla_name": "twitch.tv/friendlyherobrn", "discord_id": "303636140374884361", "discord_name": "Friendlyherobrn"}, {"brawlhalla_id": "2658232", "brawlhalla_name": "gonconist", "discord_id": "341887887995961346", "discord_name": "gonconist"}, {"brawlhalla_id": "43227947", "brawlhalla_name": "Mogzy", "discord_id": "645442530577612810", "discord_name": "AQUA"}, {"brawlhalla_id": "6433263", "brawlhalla_name": "Zwergennest", "discord_id": "386956936517648384", "discord_name": "Zwergennest"}, {"brawlhalla_id": "7124064", "brawlhalla_name": "woven", "discord_id": "129253606544113664", "discord_name": "Woven"}, {"brawlhalla_id": "39794122", "brawlhalla_name": "Dex", "discord_id": "357148393115746304", "discord_name": "Dex"}, {"brawlhalla_id": "56793941", "brawlhalla_name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "discord_id": "507524066840674312", "discord_name": "Fighter22"}, {"brawlhalla_id": "1042492", "brawlhalla_name": "Nin", "discord_id": "823299784378548264", "discord_name": "NinGotYou"}, {"brawlhalla_id": "8774115", "brawlhalla_name": "\u00f0\u009f\u008c\u009fpolar bear", "discord_id": "956341910761513000", "discord_name": "nik."}, {"brawlhalla_id": "3038693", "brawlhalla_name": "e n e r g y z ?", "discord_id": "246017232230940673", "discord_name": "energyz"}]

main.py

@@ -1,3 +1,5 @@
+# merge github and release
+
 import random
 from command_link_remove import remove_link
 from command_waitinglist_list import get_waitinglist_list
@@ -103,6 +105,9 @@ async def missing_question(ctx, error):
 @bot.command(name='lsli', description='Show All Links')
 @has_permissions(ban_members=True)
 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)
 
@@ -115,6 +120,9 @@ async def list_link(ctx):
     except:
         print('less than 26 entries')
 
+    # send name changes
+    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')
 async def qsadli(ctx, brawlhalla_id, discord_id):
@@ -128,10 +136,9 @@ async def missing_question(ctx, error):
             'format your message like the following\n`qsadli brawlhalla_id discord_id`'
         )
 
-@bot.command(name='upli')
+@bot.command(name='upli', description='manually updates all old brawlhalla names in links')
 async def upli(ctx):
-    update_links(ctx)
-    await ctx.channel.send('Updated Dair Link Data')
+    await ctx.channel.send(embed=update_links(ctx, embed_color))
 
 
 # ⬇️ WAITING LIST COMAMNDS ⬇️