Przeglądaj źródła

Fixing errors in the promotion and demotion commands.

BaumSplitter41 4 miesięcy temu
rodzic
commit
38bf90d1b5
2 zmienionych plików z 100 dodań i 100 usunięć
  1. 49 49
      VPD_BOT/cogs/demotion.py
  2. 51 51
      VPD_BOT/cogs/promotion.py

+ 49 - 49
VPD_BOT/cogs/demotion.py

@@ -17,57 +17,57 @@ class demotion(commands.Cog):
         ctx,
         user: str = Option(discord.User, "Select User", required=True),
     ):
-    if user not in ctx.guild.members:
-        await ctx.respond("The selected user is not a member on this Server!", ephemeral=True)
-        return
-    elif user == self.bot.user:
-        await ctx.respond(f"This is me - the {self.bot.user}", ephemeral=True)
-        return
-    elif user == ctx.author:
-        await ctx.respond("You cannot promote yourself!", ephemeral=True)
-        return
-    server = ctx.guild
-    config = configparser.RawConfigParser()
-    configFilePath = r'config.cfg'
-    config.read_file(open(configFilePath))
-    
-    #Role Configuration
-    department1_ranks_ids = config.get('Role Management', 'department1_ranks').split(', ')
-    department1_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department1_ranks_ids]
-    department1_supervisor_role_id = int(config.get('Einweisung', 'department1_supervisor_id'))
-    department1_supervisor_role = server.get_role(department1_supervisor_role_id)
+        if user not in ctx.guild.members:
+            await ctx.respond("The selected user is not a member on this Server!", ephemeral=True)
+            return
+        elif user == self.bot.user:
+            await ctx.respond(f"This is me - the {self.bot.user}", ephemeral=True)
+            return
+        elif user == ctx.author:
+            await ctx.respond("You cannot promote yourself!", ephemeral=True)
+            return
+        server = ctx.guild
+        config = configparser.RawConfigParser()
+        configFilePath = r'config.cfg'
+        config.read_file(open(configFilePath))
+        
+        #Role Configuration
+        department1_ranks_ids = config.get('Role Management', 'department1_ranks').split(', ')
+        department1_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department1_ranks_ids]
+        department1_supervisor_role_id = int(config.get('Einweisung', 'department1_supervisor_id'))
+        department1_supervisor_role = server.get_role(department1_supervisor_role_id)
 
-    #department2_ranks_ids = config.get('Role Management', 'department2_ranks').split(', ')
-    #department2_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department2_ranks_ids]
-    #department2_supervisor_role_id = int(config.get('Einweisung', 'department2_supervisor_id'))
-    #department2_supervisor_role = server.get_role(department2_supervisor_role_id)
+        #department2_ranks_ids = config.get('Role Management', 'department2_ranks').split(', ')
+        #department2_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department2_ranks_ids]
+        #department2_supervisor_role_id = int(config.get('Einweisung', 'department2_supervisor_id'))
+        #department2_supervisor_role = server.get_role(department2_supervisor_role_id)
 
-    #Command implementation
-    if ctx.author.roles.contains(department1_supervisor_role):
-        ranks = department1_ranks
-    #elif ctx.author.roles.contains(department2_supervisor_role):
-        #ranks = department2_ranks
-    else:
-        await ctx.respond("You do not have permission to use this command!", ephemeral=True)
-        return
-    
-    user_roles = user.roles
-    user_rank = None
-    for rank in ranks:
-        if rank in user_roles:
-            user_rank = rank
-            break
-    if user_rank is None:
-        await ctx.respond("The selected user does not have a rank that can be demoted!", ephemeral=True)
-        return
-    current_rank_index = ranks.index(user_rank)
-    if current_rank_index == 0:
-        await ctx.respond("The selected user is already at the lowest rank!", ephemeral=True)
-        return
-    new_rank = ranks[current_rank_index - 1]
-    await user.remove_roles(user_rank)
-    await user.add_roles(new_rank)
-    await ctx.respond(f"{user.mention} has been demoted to {new_rank.name}!", ephemeral=True)
+        #Command implementation
+        if ctx.author.roles.contains(department1_supervisor_role):
+            ranks = department1_ranks
+        #elif ctx.author.roles.contains(department2_supervisor_role):
+            #ranks = department2_ranks
+        else:
+            await ctx.respond("You do not have permission to use this command!", ephemeral=True)
+            return
+        
+        user_roles = user.roles
+        user_rank = None
+        for rank in ranks:
+            if rank in user_roles:
+                user_rank = rank
+                break
+        if user_rank is None:
+            await ctx.respond("The selected user does not have a rank that can be demoted!", ephemeral=True)
+            return
+        current_rank_index = ranks.index(user_rank)
+        if current_rank_index == 0:
+            await ctx.respond("The selected user is already at the lowest rank!", ephemeral=True)
+            return
+        new_rank = ranks[current_rank_index - 1]
+        await user.remove_roles(user_rank)
+        await user.add_roles(new_rank)
+        await ctx.respond(f"{user.mention} has been demoted to {new_rank.name}!", ephemeral=True)
 
 
 def setup(bot: discord.Bot):

+ 51 - 51
VPD_BOT/cogs/promotion.py

@@ -17,57 +17,57 @@ class promotion(commands.Cog):
         ctx,
         user: str = Option(discord.User, "Select User", required=True),
     ):
-    if user not in ctx.guild.members:
-        await ctx.respond("The selected user is not a member on this Server!", ephemeral=True)
-        return
-    elif user == self.bot.user:
-        await ctx.respond(f"This is me - the {self.bot.user}", ephemeral=True)
-        return
-    elif user == ctx.author:
-        await ctx.respond("You cannot promote yourself!", ephemeral=True)
-        return
-    server = ctx.guild
-    config = configparser.RawConfigParser()
-    configFilePath = r'config.cfg'
-    config.read_file(open(configFilePath))
-    
-    #Role Configuration
-    department1_ranks_ids = config.get('Role Management', 'department1_ranks').split(', ')
-    department1_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department1_ranks_ids]
-    department1_supervisor_role_id = int(config.get('Einweisung', 'department1_supervisor_id'))
-    department1_supervisor_role = server.get_role(department1_supervisor_role_id)
+        if user not in ctx.guild.members:
+            await ctx.respond("The selected user is not a member on this Server!", ephemeral=True)
+            return
+        elif user == self.bot.user:
+            await ctx.respond(f"This is me - the {self.bot.user}", ephemeral=True)
+            return
+        elif user == ctx.author:
+            await ctx.respond("You cannot promote yourself!", ephemeral=True)
+            return
+        server = ctx.guild
+        config = configparser.RawConfigParser()
+        configFilePath = r'config.cfg'
+        config.read_file(open(configFilePath))
+        
+        #Role Configuration
+        department1_ranks_ids = config.get('Role Management', 'department1_ranks').split(', ')
+        department1_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department1_ranks_ids]
+        department1_supervisor_role_id = int(config.get('Einweisung', 'department1_supervisor_id'))
+        department1_supervisor_role = server.get_role(department1_supervisor_role_id)
 
-    #department2_ranks_ids = config.get('Role Management', 'department2_ranks').split(', ')
-    #department2_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department2_ranks_ids]
-    #department2_supervisor_role_id = int(config.get('Einweisung', 'department2_supervisor_id'))
-    #department2_supervisor_role = server.get_role(department2_supervisor_role_id)
+        #department2_ranks_ids = config.get('Role Management', 'department2_ranks').split(', ')
+        #department2_ranks = [ctx.guild.get_role(int(role_id)) for role_id in department2_ranks_ids]
+        #department2_supervisor_role_id = int(config.get('Einweisung', 'department2_supervisor_id'))
+        #department2_supervisor_role = server.get_role(department2_supervisor_role_id)
 
-    #Command implementation
-    if ctx.author.roles.contains(department1_supervisor_role):
-        ranks = department1_ranks
-    #elif ctx.author.roles.contains(department2_supervisor_role):
-        #ranks = department2_ranks
-    else:
-        await ctx.respond("You do not have permission to use this command!", ephemeral=True)
-        return
-    
-    user_roles = user.roles
-    user_rank = None
-    for rank in ranks:
-        if rank in user_roles:
-            user_rank = rank
-            break
-    if user_rank is None:
-        await ctx.respond("The selected user does not have a rank that can be promoted!", ephemeral=True)
-        return
-    current_rank_index = ranks.index(user_rank)
-    if current_rank_index == len(ranks) - 1:
-        await ctx.respond("The selected user is already at the highest rank!", ephemeral=True)
-        return
-    new_rank = ranks[current_rank_index + 1]
-    await user.remove_roles(user_rank)
-    await user.add_roles(new_rank)
-    await ctx.respond(f"{user.mention} has been promoted to {new_rank.name}!", ephemeral=True)
+        #Command implementation
+        if ctx.author.roles.contains(department1_supervisor_role):
+            ranks = department1_ranks
+        #elif ctx.author.roles.contains(department2_supervisor_role):
+            #ranks = department2_ranks
+        else:
+            await ctx.respond("You do not have permission to use this command!", ephemeral=True)
+            return
+        
+        user_roles = user.roles
+        user_rank = None
+        for rank in ranks:
+            if rank in user_roles:
+                user_rank = rank
+                break
+        if user_rank is None:
+            await ctx.respond("The selected user does not have a rank that can be promoted!", ephemeral=True)
+            return
+        current_rank_index = ranks.index(user_rank)
+        if current_rank_index == len(ranks) - 1:
+            await ctx.respond("The selected user is already at the highest rank!", ephemeral=True)
+            return
+        new_rank = ranks[current_rank_index + 1]
+        await user.remove_roles(user_rank)
+        await user.add_roles(new_rank)
+        await ctx.respond(f"{user.mention} has been promoted to {new_rank.name}!", ephemeral=True)
 
-def setup(bot: discord.Bot):
-    bot.add_cog(promotion(bot))
+    def setup(bot: discord.Bot):
+        bot.add_cog(promotion(bot))