Added the Unit label role, which is given in the /einweisung and removed in the /fire command

VPD_BOT/cogs/einweisung.py

@@ -42,6 +42,8 @@ class einweisung(commands.Cog):
         department1_supervisor = server.get_role(department1_supervisor_id)
         department1_deputy_id = int(config.get('Einweisung', 'department1_deputy_id'))
         department1_deputy = server.get_role(department1_deputy_id)
+        department1_unit_role_id = int(config.get('Einweisung', 'department1_unit_role_id'))
+        department1_unit_role = server.get_role(department1_unit_role_id)
 
         #department2_supervisor_id = int(config.get('Einweisung', 'department2_supervisor_id'))
         #department2_role_id = int(config.get('Einweisung', 'department2_role_id'))
@@ -49,6 +51,8 @@ class einweisung(commands.Cog):
         #department2_supervisor = server.get_role(department2_supervisor_id)
         #department2_deputy_id = int(config.get('Einweisung', 'department2_deputy_id'))
         #department2_deputy = server.get_role(department2_deputy_id)
+        #department2_unit_role_id = int(config.get('Einweisung', 'department2_unit_role_id'))
+        #department2_unit_role = server.get_role(department2_unit_role_id)
 
 #Command implemetation
         if department1_role is None or department1_supervisor is None or acces_role is None or department1_deputy is None:
@@ -65,7 +69,7 @@ class einweisung(commands.Cog):
 
         try:
             if n == 1:
-                await user.add_roles(department1_role, department1_deputy, acces_role)
+                await user.add_roles(department1_role, department1_deputy, acces_role, department1_unit_role)
             #elif n == 2:
                # await user.add_roles(department2_role, department2_deputy, acces_role)
         except discord.Forbidden:

VPD_BOT/cogs/fire.py

@@ -42,6 +42,8 @@ class fire(commands.Cog):
         department1_supervisor_role = server.get_role(department1_supervisor_role_id)
         department1_units_id = config.get('Role Management', 'department1_units').split(', ')
         department1_units = [ctx.guild.get_role(int(role_id)) for role_id in department1_units_id]
+        department1_unit_label_id = int(config.get('Einweisung', 'department1_unit_role_id'))
+        department1_unit_label = server.get_role(department1_unit_label_id)
         #department2_role_id = config.get('Role Management', 'department2_role_id')
         #department2_role = server.get_role(int(department2_role_id))
         #department2_ranks_ids = config.get('Role Management', 'department2_ranks').split(', ')
@@ -80,7 +82,10 @@ class fire(commands.Cog):
                 access_role_id = config.get('Einweisung', 'acces_role_id')
                 access_role = server.get_role(int(access_role_id))
                 await user.remove_roles(access_role)
-            await user.remove_roles(department)
+            if department in user_roles:
+                await user.remove_roles(department)
+            if department1_unit_label in user_roles:
+                await user.remove_roles(department1_unit_label)
             for rank in ranks:
                 if rank in user_roles:
                     await user.remove_roles(rank)

VPD_BOT/config.cfg

@@ -19,10 +19,12 @@ acces_role_id = 1449145241813647380
 department1_supervisor_id = 1450499642637811764
 department1_role_id = 1459935133476851742
 department1_deputy_id = 1459935618371948743
+department1_unit_role_id = 1449384731710849135
 
 department2_supervisor_id = 
 department2_role_id = 
 department2_deputy_id =
+department2_unit_role_id =
 
 [Role Management]
 department1_command = 1451668309648084992
@@ -30,6 +32,7 @@ department1_ranks = 1459935618371948743, 1459935662102020279, 145993577310833892
 department1_units = 1448793349627838556, 1450499400488058930, 1461039851762876584, 1461039891633803364
 department1_head_unit = 1461050183000391680
 
+
 department2_command =
 department2_ranks =
 department2_units =