diff options
| author | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-08-31 17:58:49 +0200 |
|---|---|---|
| committer | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-08-31 17:58:49 +0200 |
| commit | ff3b1b70938b96a02274249c6f0dc829540fee69 (patch) | |
| tree | 1a24b6b05791f618b681d25f8c15fe4e764c83b9 /util/src | |
| parent | :bug: db query fixes (diff) | |
| parent | Merge pull request #297 from AlTech98/typeorm (diff) | |
| download | server-ff3b1b70938b96a02274249c6f0dc829540fee69.tar.xz | |
Merge branch 'typeorm' of https://github.com/fosscord/fosscord-api into typeorm
Diffstat (limited to 'util/src')
| -rw-r--r-- | util/src/entities/Config.ts | 10 | ||||
| -rw-r--r-- | util/src/entities/Guild.ts | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 04dc3c36..5eb55933 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -19,10 +19,14 @@ export interface RateLimitOptions { export interface Region { id: string; name: string; + endpoint: string; + location?: { + latitude: number; + longitude: number; + }; vip: boolean; custom: boolean; deprecated: boolean; - optimal: boolean; } export interface KafkaBroker { @@ -128,6 +132,7 @@ export interface ConfigValue { }; regions: { default: string; + useDefaultAsOptimal: boolean; available: Region[]; }; rabbitmq: { @@ -263,7 +268,8 @@ export const DefaultConfigOptions: ConfigValue = { }, regions: { default: "fosscord", - available: [{ id: "fosscord", name: "Fosscord", vip: false, custom: false, deprecated: false, optimal: false }], + useDefaultAsOptimal: true, + available: [{ id: "fosscord", name: "Fosscord", endpoint: "127.0.0.1", vip: false, custom: false, deprecated: false }], }, rabbitmq: { host: null, diff --git a/util/src/entities/Guild.ts b/util/src/entities/Guild.ts index c1ef00ac..032a9415 100644 --- a/util/src/entities/Guild.ts +++ b/util/src/entities/Guild.ts @@ -55,7 +55,7 @@ export class Guild extends BaseClass { explicit_content_filter?: number; @Column({ type: "simple-array" }) - features: string[]; + features: string[]; //TODO use enum @Column({ nullable: true }) icon?: string; |