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

[V3 Admin] Fix errors when hierarchy issues are raised (#2498)

Browse Source 
* Fix addrole mentioning who we're trying to add the role to

* More things are broken, huh

* formatting...
This commit is contained in:
TrustyJAID 2019-04-22 17:25:44 -06:00 committed by Will
parent 005123a371
commit 87c66b2423
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,14 +20,21 @@ GENERIC_FORBIDDEN = _(
) )
HIERARCHY_ISSUE = _( HIERARCHY_ISSUE = _(
"I tried to add {role.name} to {member.display_name} but that role" "I tried to {verb} {role.name} to {member.display_name} but that role"
" is higher than my highest role in the Discord hierarchy so I was" " is higher than my highest role in the Discord hierarchy so I was"
" unable to successfully add it. Please give me a higher role and " " unable to successfully add it. Please give me a higher role and "
"try again." "try again."
) )
USER_HIERARCHY_ISSUE = _( USER_HIERARCHY_ISSUE = _(
"I tried to add {role.name} to {member.display_name} but that role" "I tried to {verb} {role.name} to {member.display_name} but that role"
" is higher than your highest role in the Discord hierarchy so I was"
" unable to successfully add it. Please get a higher role and "
"try again."
)
ROLE_USER_HIERARCHY_ISSUE = _(
"I tried to edit {role.name} but that role"
" is higher than your highest role in the Discord hierarchy so I was" " is higher than your highest role in the Discord hierarchy so I was"
" unable to successfully add it. Please get a higher role and " " unable to successfully add it. Please get a higher role and "
"try again." "try again."
@ -104,7 +111,9 @@ class Admin(commands.Cog):
await member.add_roles(role) await member.add_roles(role)
except discord.Forbidden: except discord.Forbidden:
if not self.pass_hierarchy_check(ctx, role): if not self.pass_hierarchy_check(ctx, role):
await self.complain(ctx, T_(HIERARCHY_ISSUE), role=role, member=member) await self.complain(
ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("add")
)
else: else:
await self.complain(ctx, T_(GENERIC_FORBIDDEN)) await self.complain(ctx, T_(GENERIC_FORBIDDEN))
else: else:
@ -119,7 +128,9 @@ class Admin(commands.Cog):
await member.remove_roles(role) await member.remove_roles(role)
except discord.Forbidden: except discord.Forbidden:
if not self.pass_hierarchy_check(ctx, role): if not self.pass_hierarchy_check(ctx, role):
await self.complain(ctx, T_(HIERARCHY_ISSUE), role=role, member=member) await self.complain(
ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("remove")
)
else: else:
await self.complain(ctx, T_(GENERIC_FORBIDDEN)) await self.complain(ctx, T_(GENERIC_FORBIDDEN))
else: else:
@ -145,7 +156,9 @@ class Admin(commands.Cog):
# noinspection PyTypeChecker # noinspection PyTypeChecker
await self._addrole(ctx, user, rolename) await self._addrole(ctx, user, rolename)
else: else:
await self.complain(ctx, T_(USER_HIERARCHY_ISSUE), member=ctx.author, role=rolename) await self.complain(
ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("add")
)
@commands.command() @commands.command()
@commands.guild_only() @commands.guild_only()
@ -163,7 +176,9 @@ class Admin(commands.Cog):
# noinspection PyTypeChecker # noinspection PyTypeChecker
await self._removerole(ctx, user, rolename) await self._removerole(ctx, user, rolename)
else: else:
await self.complain(ctx, T_(USER_HIERARCHY_ISSUE)) await self.complain(
ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("remove")
)
@commands.group() @commands.group()
@commands.guild_only() @commands.guild_only()
@ -190,7 +205,7 @@ class Admin(commands.Cog):
reason = "{}({}) changed the colour of role '{}'".format(author.name, author.id, role.name) reason = "{}({}) changed the colour of role '{}'".format(author.name, author.id, role.name)
if not self.pass_user_hierarchy_check(ctx, role): if not self.pass_user_hierarchy_check(ctx, role):
await self.complain(ctx, T_(USER_HIERARCHY_ISSUE)) await self.complain(ctx, T_(ROLE_USER_HIERARCHY_ISSUE), role=role)
return return
try: try:
@ -218,7 +233,7 @@ class Admin(commands.Cog):
) )
if not self.pass_user_hierarchy_check(ctx, role): if not self.pass_user_hierarchy_check(ctx, role):
await self.complain(ctx, T_(USER_HIERARCHY_ISSUE)) await self.complain(ctx, T_(ROLE_USER_HIERARCHY_ISSUE), role=role)
return return
try: try: