Attempt to address PR issues

Author: Taaku18

bot.py

@@ -204,7 +204,7 @@ async def on_ready(self):
             await self.threads.populate_cache()
         await self.config.update()
 
-        closures = self.config.get('closures', {}).copy()
+        closures = self.config.closures.copy()
 
         for recipient_id, items in closures.items():
             after = (datetime.datetime.fromisoformat(items['time']) -
@@ -218,9 +218,7 @@ async def on_ready(self):
 
             if not thread:
                 # If the recipient is gone or channel is deleted
-                closures = self.config.get('closures', {})
-                closures.pop(str(recipient_id))
-                self.config['closures'] = closures
+                self.config.closures.pop(str(recipient_id))
                 await self.config.update()
                 continue
 

core/config.py

@@ -43,6 +43,7 @@ def populate_cache(self):
             'blocked': {},
             'notification_squad': {},
             'subscriptions': {},
+            'closures': {},
         }
 
         try:

core/thread.py

@@ -59,7 +59,6 @@ async def close(self, *, closer, after=0, silent=False,
             # TODO: Add somewhere to clean up broken closures
             #  (when channel is already deleted)
             await self.bot.config.update()
-            closures = self.bot.config.get('closures', {})
             now = datetime.datetime.utcnow()
             items = {
                 # 'initiation_time': now.isoformat(),
@@ -69,8 +68,7 @@ async def close(self, *, closer, after=0, silent=False,
                 'delete_channel': delete_channel,
                 'message': message
             }
-            closures[str(self.id)] = items
-            self.bot.config['closures'] = closures
+            self.bot.config.closures[str(self.id)] = items
             await self.bot.config.update()
 
             self.close_task = self.bot.loop.call_later(
@@ -84,10 +82,9 @@ async def _close(self, closer, silent=False, delete_channel=True,
                      message=None, scheduled=False):
         del self.manager.cache[self.id]
 
-        closures = self.bot.config.get('closures', {})
-        closures.pop(str(self.id))
-        self.bot.config['closures'] = closures
-        await self.bot.config.update()
+        if scheduled:
+            self.bot.config.closures.pop(str(self.id), None)
+            await self.bot.config.update()
 
         if str(self.id) in self.bot.config.subscriptions:
             del self.bot.config.subscriptions[str(self.id)]