From f69aaa223e95d8346030e3610389f1f8b60a45c1 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:39:43 +1100 Subject: Fix config loading --- src/util/util/Config.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/util/Config.ts b/src/util/util/Config.ts index 18e0b76c..f5758212 100644 --- a/src/util/util/Config.ts +++ b/src/util/util/Config.ts @@ -14,12 +14,16 @@ var pairs: ConfigEntity[]; export const Config = { init: async function init() { if (config) return config; - console.log('[Config] Loading configuration...') + console.log('[Config] Loading configuration...'); pairs = await ConfigEntity.find(); config = pairsToConfig(pairs); // TODO: this overwrites existing config values with defaults. // we actually want to extend the object with new keys instead. // config = (config || {}).merge(new ConfigValue()); + // Object.assign(config, new ConfigValue()); + + // If a config doesn't exist, create it. + if (Object.keys(config).length == 0) config = new ConfigValue(); if (process.env.CONFIG_PATH) { console.log(`[Config] Using config path from environment rather than database.`); -- cgit 1.4.1