diff --git a/jarvis/cogs/admin/ban.py b/jarvis/cogs/admin/ban.py index 72f8f86..21db454 100644 --- a/jarvis/cogs/admin/ban.py +++ b/jarvis/cogs/admin/ban.py @@ -151,6 +151,8 @@ class BanCog(CacheCog): "Mr. Stark is displeased with your presence. Please leave." ) + await ctx.defer() + mtype = type if mtype == "perm": mtype = "perma" @@ -169,7 +171,7 @@ class BanCog(CacheCog): fields.append(Field(name="Duration", value=f"{duration} hour(s)")) user_embed = build_embed( - title="You have been banned", + title=f"You have been banned from {ctx.guild.name}", description=f"Reason: {reason}", fields=fields, ) diff --git a/jarvis/cogs/admin/kick.py b/jarvis/cogs/admin/kick.py index d145a00..062082f 100644 --- a/jarvis/cogs/admin/kick.py +++ b/jarvis/cogs/admin/kick.py @@ -57,7 +57,7 @@ class KickCog(CacheCog): name=ctx.author.name + "#" + ctx.author.discriminator, icon_url=ctx.author.avatar_url, ) - embed.set_thumbnail(ctx.guild.icon_url) + embed.set_thumbnail(url=ctx.guild.icon_url) send_failed = False try: diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py index e073531..2171d08 100644 --- a/jarvis/cogs/admin/mute.py +++ b/jarvis/cogs/admin/mute.py @@ -51,7 +51,9 @@ class MuteCog(commands.Cog): if len(reason) > 100: await ctx.send("Reason must be < 100 characters", hidden=True) return - mute_setting = Setting.get(guild=ctx.guild.id, setting="mute") + mute_setting = Setting.objects( + guild=ctx.guild.id, setting="mute" + ).first() if not mute_setting: await ctx.send( "Please configure a mute role " diff --git a/jarvis/cogs/admin/warning.py b/jarvis/cogs/admin/warning.py index e154ea5..628bb5c 100644 --- a/jarvis/cogs/admin/warning.py +++ b/jarvis/cogs/admin/warning.py @@ -116,7 +116,7 @@ class WarningCog(CacheCog): guild=ctx.guild.id, ).order_by("-created_at") active_warns = Warning.objects( - user=user.id, guild=ctx.guild.id, active=False + user=user.id, guild=ctx.guild.id, active=True ).order_by("-created_at") pages = [] diff --git a/jarvis/cogs/jokes.py b/jarvis/cogs/jokes.py index d153f4f..bcbf7ca 100644 --- a/jarvis/cogs/jokes.py +++ b/jarvis/cogs/jokes.py @@ -39,9 +39,9 @@ class JokeCog(commands.Cog): {"$match": {"score": {"$gt": threshold}}}, {"$sample": {"size": 1}}, ] - result = Joke.objects().aggregate(pipeline) + result = Joke.objects().aggregate(pipeline).first() while result.body in ["[removed]", "[deleted]"]: - result = Joke.objects().aggregate(pipeline) + result = Joke.objects().aggregate(pipeline).first() if result is None: await ctx.send( diff --git a/jarvis/db/models.py b/jarvis/db/models.py index b95e9c7..06f9371 100644 --- a/jarvis/db/models.py +++ b/jarvis/db/models.py @@ -126,6 +126,7 @@ class Reminder(Document): active = BooleanField(default=True) user = SnowflakeField(required=True) guild = SnowflakeField(required=True) + channel = SnowflakeField(required=True) message = StringField(max_length=100, required=True) remind_at = DateTimeField(required=True) created_at = DateTimeField(default=datetime.utcnow)