summary refs log tree commit diff
path: root/util/src/util/Config.ts
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-08-13 13:03:18 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-08-13 13:03:18 +0200
commita687b489d745c52e207637b6595edcb3eabe8f2d (patch)
tree98d45b035c2c9589d9702a9a2f442b62f9a3ab99 /util/src/util/Config.ts
parentFix naming (diff)
parentabstract Event emission (diff)
downloadserver-a687b489d745c52e207637b6595edcb3eabe8f2d.tar.xz
Merge branch 'master' into pr/darkhpp/261-2
Diffstat (limited to '')
-rw-r--r--util/src/util/Config.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/src/util/Config.ts b/util/src/util/Config.ts

index 78b44315..b4648668 100644 --- a/util/src/util/Config.ts +++ b/util/src/util/Config.ts
@@ -1,6 +1,6 @@ import { Schema, model, Types, Document } from "mongoose"; import "missing-native-js-functions"; -import db, { MongooseCache } from "./Database"; +import db from "./Database"; import { Snowflake } from "./Snowflake"; import crypto from "crypto"; @@ -15,6 +15,7 @@ export default { return config as DefaultOptions; }, set: function set(val: any) { + config = val.merge(config); return db.collection("config").updateOne({}, { $set: val }, { upsert: true }); }, };