aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Izan <[email protected]>2021-09-01 16:33:10 +0100
committerGravatar Izan <[email protected]>2021-09-01 16:33:10 +0100
commit8fa3fa1d80933a539cef52c1949dd14d0d96dfd1 (patch)
tree73e883b450c5e98400cb116be4751355398e75e0
parentPrevent infractions raising error due to role hierarchy (diff)
Fix role hierarchy check
Now uses `>=` instead of `>`, as is meant to happen.
-rw-r--r--bot/exts/moderation/infraction/infractions.py8
-rw-r--r--bot/exts/moderation/infraction/superstarify.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 4afa66460..93a6b6c8b 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -314,8 +314,8 @@ class Infractions(InfractionScheduler, commands.Cog):
@respect_role_hierarchy(member_arg=2)
async def apply_kick(self, ctx: Context, user: Member, reason: t.Optional[str], **kwargs) -> None:
"""Apply a kick infraction with kwargs passed to `post_infraction`."""
- if user.top_role > ctx.me.top_role:
- await ctx.send(":x: I can't kick users above me in the role hierarchy.")
+ if user.top_role >= ctx.me.top_role:
+ await ctx.send(":x: I can't kick users above or equal to me in the role hierarchy.")
return
infraction = await _utils.post_infraction(ctx, user, "kick", reason, active=False, **kwargs)
@@ -344,8 +344,8 @@ class Infractions(InfractionScheduler, commands.Cog):
Will also remove the banned user from the Big Brother watch list if applicable.
"""
- if hasattr(user, 'top_role') and user.top_role > ctx.me.top_role:
- await ctx.send(":x: I can't ban users above me in the role hierarchy.")
+ if hasattr(user, 'top_role') and user.top_role >= ctx.me.top_role:
+ await ctx.send(":x: I can't ban users above or equal to me in the role hierarchy.")
return
# In the case of a permanent ban, we don't need get_active_infractions to tell us if one is active
diff --git a/bot/exts/moderation/infraction/superstarify.py b/bot/exts/moderation/infraction/superstarify.py
index 2b111fed7..986decdd6 100644
--- a/bot/exts/moderation/infraction/superstarify.py
+++ b/bot/exts/moderation/infraction/superstarify.py
@@ -132,8 +132,8 @@ class Superstarify(InfractionScheduler, Cog):
An optional reason can be provided, which would be added to a message stating their old nickname
and linking to the nickname policy.
"""
- if member.top_role > ctx.me.top_role:
- await ctx.send(":x: I can't starify users above me in the role hierarchy.")
+ if member.top_role >= ctx.me.top_role:
+ await ctx.send(":x: I can't starify users above or equal to me in the role hierarchy.")
return
if await _utils.get_active_infraction(ctx, member, "superstar"):