summary refs log tree commit diff
path: root/src/util/Config.ts
diff options
context:
space:
mode:
authorDiego Magdaleno <38844659+DiegoMagdaleno@users.noreply.github.com>2021-07-21 15:37:24 -0500
committerGitHub <noreply@github.com>2021-07-21 15:37:24 -0500
commit2752f481b6b7479d9ca16eb11537ec78e3fd103c (patch)
treef218c16bbe8e0f95ea7a55326cfc139376e57949 /src/util/Config.ts
parentFix: Edited timestamp is Date or NULL (diff)
parent1.3.31 (diff)
downloadserver-2752f481b6b7479d9ca16eb11537ec78e3fd103c.tar.xz
Merge branch 'fosscord:master' into master
Diffstat (limited to 'src/util/Config.ts')
-rw-r--r--src/util/Config.ts8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/util/Config.ts b/src/util/Config.ts

index f125bd18..dfa942e7 100644 --- a/src/util/Config.ts +++ b/src/util/Config.ts
@@ -4,12 +4,12 @@ import db, { MongooseCache } from "./Database"; import { Snowflake } from "./Snowflake"; import crypto from "crypto"; -var Config = new MongooseCache(db.collection("config"), [], { onlyEvents: false }); +var Config = new MongooseCache(db.collection("config"), [], { onlyEvents: false, array: false }); export default { init: async function init(defaultOpts: any = DefaultOptions) { await Config.init(); - return this.set(Config.data.merge(defaultOpts)); + return this.set((Config.data || {}).merge(defaultOpts)); }, get: function get() { return <DefaultOptions>Config.data; @@ -88,6 +88,7 @@ export interface DefaultOptions { sitekey: string | null; secret: string | null; }; + ipdataApiKey: string | null; }; login: { requireCaptcha: boolean; @@ -107,6 +108,7 @@ export interface DefaultOptions { requireInvite: boolean; allowNewRegistration: boolean; allowMultipleAccounts: boolean; + blockProxies: boolean; password: { minLength: number; minNumbers: number; @@ -176,6 +178,7 @@ export const DefaultOptions: DefaultOptions = { sitekey: null, secret: null, }, + ipdataApiKey: "eca677b284b3bac29eb72f5e496aa9047f26543605efe99ff2ce35c9", }, login: { requireCaptcha: false, @@ -196,6 +199,7 @@ export const DefaultOptions: DefaultOptions = { requireCaptcha: true, allowNewRegistration: true, allowMultipleAccounts: true, + blockProxies: true, password: { minLength: 8, minNumbers: 2,