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

Properly handle locked channel being deleted

Browse source
This commit is contained in:
Zeva Rose 2022-04-19 12:05:15 -06:00
parent b8c64bae31
commit 7dcfd1aaf7
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jarvis_tasks/tasks/lock.py
View file

@ -14,6 +14,7 @@ from jarvis_tasks.util import runat
async def _unlock(channel: GuildChannel, lock: Lock, logger: Logger) -> None: async def _unlock(channel: GuildChannel, lock: Lock, logger: Logger) -> None:
logger.debug(f"Deactivating lock {lock.id}") logger.debug(f"Deactivating lock {lock.id}")
try:
overwrite = get(channel.permission_overwrites, id=lock.guild) overwrite = get(channel.permission_overwrites, id=lock.guild)
if overwrite and lock.original_perms: if overwrite and lock.original_perms:
overwrite.allow = lock.original_perms.allow overwrite.allow = lock.original_perms.allow
@ -23,13 +24,12 @@ async def _unlock(channel: GuildChannel, lock: Lock, logger: Logger) -> None:
except Exception: except Exception:
logger.debug("Locked channel deleted, ignoring error") logger.debug("Locked channel deleted, ignoring error")
elif overwrite and not lock.original_perms: elif overwrite and not lock.original_perms:
try:
await channel.delete_permission(target=overwrite, reason="Automatic unlock") await channel.delete_permission(target=overwrite, reason="Automatic unlock")
except Exception:
logger.debug("Locked channel deleted, ignoring error")
else: else:
logger.debug("Permission neither exists not existed") logger.debug("Permission neither exists not existed")
lock.active = False lock.active = False
except Exception:
logger.debug("Locked channel deleted, ignoring error")
await lock.commit() await lock.commit()