Merge branch 'staging' into patch-startup

Pull a bugfix from staging into the patch.
This commit is contained in:
2021-11-07 01:53:49 +02:00

View File

@@ -178,6 +178,8 @@ class Room:
""" """
Expire the room. Expire the room.
""" """
guild_settings = GuildSettings(self.data.guildid)
if self.channel: if self.channel:
# Delete the discord channel # Delete the discord channel
try: try:
@@ -188,7 +190,6 @@ class Room:
# Delete the room from data (cascades to member deletion) # Delete the room from data (cascades to member deletion)
self.delete() self.delete()
guild_settings = GuildSettings(self.data.guildid)
guild_settings.event_log.log( guild_settings.event_log.log(
title="Private study room expired!", title="Private study room expired!",
description="<@{}>'s private study room expired.".format(self.data.ownerid) description="<@{}>'s private study room expired.".format(self.data.ownerid)