From 23a5ac0849983aad807e748311eeab85db951aef Mon Sep 17 00:00:00 2001 From: zevaryx Date: Sat, 19 Feb 2022 17:19:37 -0700 Subject: [PATCH] Add error handling to unban --- jarvis_tasks/tasks/ban.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jarvis_tasks/tasks/ban.py b/jarvis_tasks/tasks/ban.py index 7c94eca..257f8c1 100644 --- a/jarvis_tasks/tasks/ban.py +++ b/jarvis_tasks/tasks/ban.py @@ -4,6 +4,7 @@ from datetime import datetime, timedelta from logging import Logger from dis_snek import Snake +from dis_snek.client.errors import NotFound from jarvis_core.db import q from jarvis_core.db.models import Ban, Unban @@ -25,14 +26,17 @@ async def unban(bot: Snake, logger: Logger) -> None: user = await bot.fetch_user(ban.user) if guild and user: logger.debug(f"Unbanned user {user.id} from guild {guild.id}") - await guild.unban(user=user, reason="JARVIS tempban expired") + try: + await guild.unban(user=user, reason="JARVIS tempban expired") + except NotFound: + logger.debug(f"User {user.id} not banned from guild {guild.id}") ban.update(q(active=False)) await ban.commit() u = Unban( user=user.id, guild=guild.id, - username=user.name, + username=user.username, discrim=user.discriminator, admin=bot.user.id, reason="Ban expired",