summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-12-19 18:35:36 +1100
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-12-19 18:35:36 +1100
commit295ef797fb1506de62dc78dec9652c6e683fb45e (patch)
tree655742da477b15635f45e5aedcb2e70691a95bd1
parentMove UserSettings to own entity (diff)
downloadserver-295ef797fb1506de62dc78dec9652c6e683fb45e.tar.xz
Don't override existing config values
-rw-r--r--src/util/util/Config.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/util/util/Config.ts b/src/util/util/Config.ts
index ff2feb36..18e0b76c 100644
--- a/src/util/util/Config.ts
+++ b/src/util/util/Config.ts
@@ -17,7 +17,9 @@ export const Config = {
 		console.log('[Config] Loading configuration...')
 		pairs = await ConfigEntity.find();
 		config = pairsToConfig(pairs);
-		config = (config || {}).merge(new ConfigValue());
+		// TODO: this overwrites existing config values with defaults.
+		// we actually want to extend the object with new keys instead.
+		// config = (config || {}).merge(new ConfigValue());
 
 		if (process.env.CONFIG_PATH) {
 			console.log(`[Config] Using config path from environment rather than database.`);