BUGFIX:

- use deep_merge() for config files (support DEFAULT handling for complex structures)

Author: karel26

core/data/server.py

@@ -80,7 +80,7 @@ def read_locals(self) -> dict:
                 raise YAMLError(config_file, ex)
             if data.get(self.name) is None and self.name != 'n/a':
                 self.log.warning(f'No configuration found for server "{self.name}" in servers.yaml!')
-            _locals = data.get(DEFAULT_TAG, {}) | data.get(self.name, {})
+            _locals = utils.deep_merge(data.get(DEFAULT_TAG, {}), data.get(self.name, {}))
             _locals['messages'] = {
                 "greeting_message_members": "{player.name}, welcome back to {server.name}!",
                 "greeting_message_unmatched": "{player.name}, please use /linkme in our Discord, if you want to see your user stats!",

core/plugin.py

@@ -497,7 +497,7 @@ def get_config(self, server: Optional[Server] = None, *, plugin_name: Optional[s
             self._config[server.node.name] = {}
         if server.instance.name not in self._config[server.node.name] or not use_cache:
             default, specific = self.get_base_config(server)
-            self._config[server.node.name][server.instance.name] = default | specific
+            self._config[server.node.name][server.instance.name] = utils.deep_merge(default, specific)
         return self._config[server.node.name][server.instance.name]
 
     async def rename(self, conn: psycopg.AsyncConnection, old_name: str, new_name: str) -> None:

core/services/base.py

@@ -165,8 +165,8 @@ def get_config(self, server: Optional[Server] = None) -> dict:
         if server.node.name not in self._config:
             self._config[server.node.name] = {}
         if server.instance.name not in self._config[server.node.name]:
-            self._config[server.node.name][server.instance.name] = (
-                    self.locals.get(DEFAULT_TAG, {}) |
+            self._config[server.node.name][server.instance.name] = utils.deep_merge(
+                    self.locals.get(DEFAULT_TAG, {}),
                     self.locals.get(server.node.name, self.locals).get(server.instance.name, {})
             )
         return self._config.get(server.node.name, {}).get(server.instance.name, {})

plugins/mission/migrate.py

@@ -86,7 +86,7 @@ def _change_instance(instance: dict):
         if 'slotblocking' not in self.node.plugins:
             instance.pop('message_server_full', None)
 
-    # first of all, reorganise the messages in servers.yaml
+    # first, re-organize the messages in servers.yaml
     server_config = os.path.join(self.node.config_dir, 'servers.yaml')
     server_data = yaml.load(Path(server_config).read_text(encoding='utf-8'))
     # make sure we have a default tag