Merge branch 'typeorm' of https://github.com/fosscord/fosscord-api into typeorm

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;