Clean up internal config cache

Author: kyb3r

bot.py

@@ -49,8 +49,6 @@
 
 class ModmailBot(commands.Bot):
 
-    mutable_config_keys = ['prefix', 'status', 'guild_id', 'mention', 'autoupdates', 'modmail_guild_id']
-
     def __init__(self):
         super().__init__(command_prefix=self.get_pre)
         self.version = __version__

cogs/utility.py

@@ -355,11 +355,11 @@ async def _set(self, ctx, key: str.lower, *, value):
             description=f'Set `{key}` to `{value}`'
         )
 
-        if key not in self.bot.mutable_config_keys:
+        if key not in self.bot.config.allowed_to_change_in_command:
             em.title = 'Error'
             em.color = discord.Color.green()
             em.description = f'{key} is an invalid key.'
-            valid_keys = [f'`{k}`' for k in self.bot.mutable_config_keys]
+            valid_keys = [f'`{k}`' for k in self.bot.config.allowed_to_change_in_command]
             em.add_field(name='Valid keys', value=', '.join(valid_keys))
         else:
             await self.bot.config.update({key: value})
@@ -375,11 +375,11 @@ async def _del(self, ctx, key: str.lower):
             description=f'Set `{key}` to nothing.'
         )
 
-        if key not in self.bot.mutable_config_keys:
+        if key not in self.bot.config.allowed_to_change_in_command:
             em.title = 'Error'
             em.color = discord.Color.green()
             em.description = f'{key} is an invalid key.'
-            valid_keys = [f'`{k}`' for k in self.bot.mutable_config_keys]
+            valid_keys = [f'`{k}`' for k in self.bot.config.allowed_to_change_in_command]
             em.add_field(name='Valid keys', value=', '.join(valid_keys))
         else:
             self.bot.config.cache[key] = None
@@ -393,11 +393,11 @@ async def get(self, ctx, key=None):
         em = discord.Embed(color=discord.Color.green())
         em.set_author(name='Current config', icon_url=self.bot.user.avatar_url)
 
-        if key and key not in self.bot.mutable_config_keys:
+        if key and key not in self.bot.config.allowed_to_change_in_command:
             em.title = 'Error'
             em.color = discord.Color.green()
             em.description = f'`{key}` is an invalid key.'
-            valid_keys = [f'`{k}`' for k in self.bot.mutable_config_keys]
+            valid_keys = [f'`{k}`' for k in self.bot.config.allowed_to_change_in_command]
             em.add_field(name='Valid keys', value=', '.join(valid_keys))
         elif key:
             em.set_author(name='Config variable', icon_url=self.bot.user.avatar_url)
@@ -407,7 +407,7 @@ async def get(self, ctx, key=None):
 
             config = {
                 k: v for k, v in self.bot.config.cache.items()
-                if v and k in self.bot.mutable_config_keys
+                if v and k in self.bot.config.allowed_to_change_in_command
             }
 
             for k, v in reversed(list(config.items())):

core/api.py

@@ -68,7 +68,9 @@ def get_config(self):
         return self.request(self.config)
 
     def update_config(self, data):
-        valid_keys = ['prefix', 'status', 'guild_id', 'mention', 'snippets', 'aliases', 'autoupdates', 'modmail_guild_id']
+
+        valid_keys = self.app.config.valid_keys - {'token', 'modmail_api_token', 'modmail_guild_id', 'guild_id'}
+
         data = {k: v for k, v in data.items() if k in valid_keys}
         return self.request(self.config, method='PATCH', payload=data)
 

core/config.py

@@ -7,6 +7,17 @@
 class ConfigManager:
     """Class that manages a cached configuration"""
 
+    valid_keys = {
+        'prefix', 'status', 'guild_id', 
+        'mention', 'disable_autoupdates', 
+        'modmail_guild_id', 'token', 'snippets', 
+        'aliases', 'owners', 'modmail_api_token'
+        }
+    
+    
+    allowed_to_change_in_command = valid_keys - {'token', 'snippets', 'aliases', 'owners', 'modmail_api_token'}
+
+
     def __init__(self, bot):
         self.bot = bot
         self.cache = box.Box()
@@ -24,7 +35,7 @@ def populate_cache(self):
             data = {}
         finally:
             data.update(os.environ)
-            data = {k.lower(): v for k, v in data.items()}
+            data = {k.lower(): v for k, v in data.items() if k.lower() in self.valid_keys}
             self.cache = data
 
         self.bot.loop.create_task(self.refresh())
@@ -52,14 +63,3 @@ def __getitem__(self, key):
 
     def get(self, value, default=None):
         return self.cache.get(value) or default
-
-    @property
-    def modified(self):
-        return self._modified
-
-    @modified.setter
-    def modified(self, flag):
-        """If set to true, update() will be called"""
-        if flag is True:
-            asyncio.create_task(self.update())
-            self._modified = True