Akumatic/Akuma-Matata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix exclusive groups of self-assignable roles

Browse Source
This commit is contained in:
Akumatic 2019-10-09 01:14:47 +02:00
parent bddb346df3
commit c08aba1fbb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/server.py
View File

@ -423,7 +423,7 @@ class Server(commands.Cog):
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
async def iam(self, ctx, *, role: typing.Union[discord.Role, str] = None): async def iam(self, ctx, role: typing.Union[discord.Role, str] = None):
self.serverCfgCheck(ctx.guild.id, "sar", {"default": []}) self.serverCfgCheck(ctx.guild.id, "sar", {"default": []})
member = ctx.guild.get_member(ctx.author.id) member = ctx.guild.get_member(ctx.author.id)
e = discord.Embed(title="<< Assign self-assignable role >>") e = discord.Embed(title="<< Assign self-assignable role >>")
@ -453,12 +453,12 @@ class Server(commands.Cog):
return await ctx.send(embed=e) return await ctx.send(embed=e)
else: else:
e.color = discord.Color.red() e.color = discord.Color.red()
e.add_field(name="Role does not exist", value="The given role does not exist on this server.") e.add_field(name="Role does not exist", value=f"{role} does not exist on this server.")
await ctx.send(embed=e) await ctx.send(embed=e)
@commands.command(aliases=["iamn"]) @commands.command(aliases=["iamn"])
@commands.guild_only() @commands.guild_only()
async def iamnot(self, ctx, *, role: typing.Union[discord.Role, str] = None): async def iamnot(self, ctx, role: typing.Union[discord.Role, str] = None):
self.serverCfgCheck(ctx.guild.id, "sar", {"default": []}) self.serverCfgCheck(ctx.guild.id, "sar", {"default": []})
member = ctx.guild.get_member(ctx.author.id) member = ctx.guild.get_member(ctx.author.id)
e = discord.Embed(title="<< Unassign self-assignable role >>") e = discord.Embed(title="<< Unassign self-assignable role >>")
@ -477,13 +477,13 @@ class Server(commands.Cog):
e.add_field(name="Role not assigned", value=f"You don't have the role {role}.") e.add_field(name="Role not assigned", value=f"You don't have the role {role}.")
else: else:
e.color = discord.Color.red() e.color = discord.Color.red()
e.add_field(name="Role does not exist", value="The given role does not exist on this server.") e.add_field(name="Role does not exist", value=f"{role} does not exist on this server.")
await ctx.send(embed=e) await ctx.send(embed=e)
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
@commands.has_permissions(manage_roles=True) @commands.has_permissions(manage_roles=True)
async def asar(self, ctx, *, role: typing.Union[discord.Role, str] = None, exclusive: str = None): async def asar(self, ctx, role: typing.Union[discord.Role, str] = None, exclusive: str = None):
self.serverCfgCheck(ctx.guild.id, "sar", {"default": []}) self.serverCfgCheck(ctx.guild.id, "sar", {"default": []})
e = discord.Embed(title="<< Add self-assignable role >>") e = discord.Embed(title="<< Add self-assignable role >>")
if role is None: if role is None:
@ -517,13 +517,13 @@ class Server(commands.Cog):
e.add_field(name="Missing Permissions", value="You can only add roles lower than your highest role.") e.add_field(name="Missing Permissions", value="You can only add roles lower than your highest role.")
else: else:
e.color = discord.Color.red() e.color = discord.Color.red()
e.add_field(name="Role does not exist", value="The given role does not exist on this server.") e.add_field(name="Role does not exist", value=f"{role} does not exist on this server.")
await ctx.send(embed=e) await ctx.send(embed=e)
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
@commands.has_permissions(manage_roles=True) @commands.has_permissions(manage_roles=True)
async def rsar(self, ctx, *, role: typing.Union[discord.Role, str] = None): async def rsar(self, ctx, role: typing.Union[discord.Role, str] = None):
self.serverCfgCheck(ctx.guild.id, "sar", {"default": []}) self.serverCfgCheck(ctx.guild.id, "sar", {"default": []})
e = discord.Embed(title="<< Remove self-assignable role >>") e = discord.Embed(title="<< Remove self-assignable role >>")
if role is None: if role is None:
@ -544,7 +544,7 @@ class Server(commands.Cog):
e.add_field(name="Role not self-assignable", value="The role is not self-assignable.") e.add_field(name="Role not self-assignable", value="The role is not self-assignable.")
else: else:
e.color = discord.Color.red() e.color = discord.Color.red()
e.add_field(name="Role does not exist", value="The given role does not exist on this server.") e.add_field(name="Role does not exist", value=f"{role} does not exist on this server.")
await ctx.send(embed=e) await ctx.send(embed=e)
@commands.command() @commands.command()
@ -565,6 +565,7 @@ class Server(commands.Cog):
e.add_field(inline=False, name=f"{g} (Exclusive)", value=s) e.add_field(inline=False, name=f"{g} (Exclusive)", value=s)
await ctx.send(embed=e) await ctx.send(embed=e)
#Setup #Setup
def setup(bot): def setup(bot):
bot.add_cog(Server(bot)) bot.add_cog(Server(bot))