From 7ded85fa2409e40ec7dfb965cbdf24749a8b3aa9 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 29 May 2022 19:18:18 -0600 Subject: [PATCH] Catch issues with user not in guild, closes #144, closes #145 --- jarvis/cogs/admin/kick.py | 3 +++ jarvis/cogs/admin/mute.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jarvis/cogs/admin/kick.py b/jarvis/cogs/admin/kick.py index 820b777..1f60354 100644 --- a/jarvis/cogs/admin/kick.py +++ b/jarvis/cogs/admin/kick.py @@ -34,6 +34,9 @@ class KickCog(ModcaseCog): if len(reason) > 100: await ctx.send("Reason must be < 100 characters", ephemeral=True) return + if not ctx.guild.fetch_member(user.id): + await ctx.send("User must be in guild", ephemeral=True) + return guild_name = ctx.guild.name embed = build_embed( diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py index cbcfab3..51edda8 100644 --- a/jarvis/cogs/admin/mute.py +++ b/jarvis/cogs/admin/mute.py @@ -170,6 +170,9 @@ class MuteCog(ModcaseCog): if len(reason) > 100: await ctx.send("Reason must be < 100 characters", ephemeral=True) return + if not ctx.guild.fetch_member(user.id): + await ctx.send("User must be in guild", ephemeral=True) + return # Max 4 weeks (2419200 seconds) per API duration = time * scale