Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (rooms): Cancel rooms on system shutdown.

Browse Source 
Fix typos in the `success_response` for `accountability_category`.
Make the `TimeSlot.cancel()` method more robust.
This commit is contained in:
Conatum
2021-10-20 12:55:36 +03:00
parent ace44d0d7d
commit 42e47bea1a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bot/modules/accountability/TimeSlot.py
View File

@@ -409,12 +409,13 @@ class TimeSlot:
if self.channel: if self.channel:
try: try:
await self.channel.delete() await self.channel.delete()
self.channel = None
except discord.HTTPException: except discord.HTTPException:
pass pass
if self.message: if self.message:
try: try:
timestamp = self.start_time.timestamp() timestamp = int(self.start_time.timestamp())
embed = discord.Embed( embed = discord.Embed(
title="Session <t:{}:t> - <t:{}:t>".format( title="Session <t:{}:t> - <t:{}:t>".format(
timestamp, timestamp + 3600 timestamp, timestamp + 3600

9
bot/modules/accountability/admin.py
View File

@@ -1,3 +1,4 @@
import asyncio
import discord import discord
import settings import settings
@@ -37,12 +38,12 @@ class accountability_category(settings.Channel, settings.GuildSetting):
return "The accountability system has been started in **{}**.".format(self.value.name) return "The accountability system has been started in **{}**.".format(self.value.name)
else: else:
if self.id in AG.cache: if self.id in AG.cache:
aguild = AG.cache[self.id] aguild = AG.cache.pop(self.id)
if aguild.current_slot: if aguild.current_slot:
aguild.current_lost.cancel() asyncio.create_task(aguild.current_slot.cancel())
if aguild.upcoming_slot: if aguild.upcoming_slot:
aguild.upcoming_slot.cancel() asyncio.create_task(aguild.upcoming_slot.cancel())
return "The accountability system has been stopped." return "The accountability system has been shut down."
else: else:
return "The accountability category has been unset." return "The accountability category has been unset."