summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-12-19 20:39:43 +1100
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-12-19 20:39:43 +1100
commitf69aaa223e95d8346030e3610389f1f8b60a45c1 (patch)
tree90d1397f7ccd532e93a51b2fda92c4125812dd5c /src
parentimplement guild profiles and fix user profiles (diff)
downloadserver-f69aaa223e95d8346030e3610389f1f8b60a45c1.tar.xz
Fix config loading
Diffstat (limited to 'src')
-rw-r--r--src/util/util/Config.ts6
1 files changed, 5 insertions, 1 deletions
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.`);