jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No longer allow warning user not in guild

Browse source
This commit is contained in:
Zeva Rose 2022-04-19 11:41:21 -06:00
parent 2235479b40
commit 785f67c9c4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
jarvis/cogs/admin/warning.py
View file

@ -5,7 +5,7 @@ from dis_snek import InteractionContext, Permissions, Snake
from dis_snek.client.utils.misc_utils import get_all from dis_snek.client.utils.misc_utils import get_all
from dis_snek.ext.paginators import Paginator from dis_snek.ext.paginators import Paginator
from dis_snek.models.discord.embed import EmbedField from dis_snek.models.discord.embed import EmbedField
from dis_snek.models.discord.user import User from dis_snek.models.discord.user import Member
from dis_snek.models.snek.application_commands import ( from dis_snek.models.snek.application_commands import (
OptionTypes, OptionTypes,
slash_command, slash_command,
@ -44,7 +44,7 @@ class WarningCog(ModcaseCog):
) )
@check(admin_or_permissions(Permissions.MANAGE_GUILD)) @check(admin_or_permissions(Permissions.MANAGE_GUILD))
async def _warn( async def _warn(
self, ctx: InteractionContext, user: User, reason: str, duration: int = 24 self, ctx: InteractionContext, user: Member, reason: str, duration: int = 24
) -> None: ) -> None:
if len(reason) > 100: if len(reason) > 100:
await ctx.send("Reason must be < 100 characters", ephemeral=True) await ctx.send("Reason must be < 100 characters", ephemeral=True)
@ -55,6 +55,9 @@ class WarningCog(ModcaseCog):
elif duration >= 120: elif duration >= 120:
await ctx.send("Duration must be < 5 days", ephemeral=True) await ctx.send("Duration must be < 5 days", ephemeral=True)
return return
if not await ctx.guild.fetch_member(user.id):
await ctx.send("User not in guild", ephemeral=True)
return
await ctx.defer() await ctx.defer()
await Warning( await Warning(
user=user.id, user=user.id,
@ -76,7 +79,7 @@ class WarningCog(ModcaseCog):
required=False, required=False,
) )
@check(admin_or_permissions(Permissions.MANAGE_GUILD)) @check(admin_or_permissions(Permissions.MANAGE_GUILD))
async def _warnings(self, ctx: InteractionContext, user: User, active: bool = True) -> None: async def _warnings(self, ctx: InteractionContext, user: Member, active: bool = True) -> None:
warnings = ( warnings = (
await Warning.find( await Warning.find(
q( q(