CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Admin] Notify when the user has/doesn't have the role when att… (#3408)

Browse Source 
* Update admin.py

* Create 3010.enhance.rst
This commit is contained in:
Flame442 2020-01-18 10:10:25 -08:00 committed by Draper
parent 826dae129e
commit 54e65082bc
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/admin/3010.enhance.rst Normal file
View File

@ -0,0 +1 @@
Role granting/removing commands will now notify when the user already has/doesn't have a role when attempting to add/remove it.

18
redbot/cogs/admin/admin.py
View File

@ -121,8 +121,13 @@ class Admin(commands.Cog):
async def _addrole( async def _addrole(
self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True
): ):
if member is None: if role in member.roles:
member = ctx.author await ctx.send(
_("{member.display_name} already has the role {role.name}.").format(
role=role, member=member
)
)
return
if check_user and not self.pass_user_hierarchy_check(ctx, role): if check_user and not self.pass_user_hierarchy_check(ctx, role):
await ctx.send(_(USER_HIERARCHY_ISSUE_ADD).format(role=role, member=member)) await ctx.send(_(USER_HIERARCHY_ISSUE_ADD).format(role=role, member=member))
return return
@ -146,8 +151,13 @@ class Admin(commands.Cog):
async def _removerole( async def _removerole(
self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True
): ):
if member is None: if role not in member.roles:
member = ctx.author await ctx.send(
_("{member.display_name} does not have the role {role.name}.").format(
role=role, member=member
)
)
return
if check_user and not self.pass_user_hierarchy_check(ctx, role): if check_user and not self.pass_user_hierarchy_check(ctx, role):
await ctx.send(_(USER_HIERARCHY_ISSUE_REMOVE).format(role=role, member=member)) await ctx.send(_(USER_HIERARCHY_ISSUE_REMOVE).format(role=role, member=member))
return return