3 files changed, 82 insertions, 38 deletions
diff --git a/src/util/entities/Application.ts b/src/util/entities/Application.ts
index fab3d93f..28381579 100644
--- a/src/util/entities/Application.ts
+++ b/src/util/entities/Application.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
+import { Column, Entity, JoinColumn, ManyToOne, OneToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
 import { Team } from "./Team";
@@ -8,21 +8,77 @@ import { User } from "./User";
 export class Application extends BaseClass {
 	@Column()
 	name: string;
-
+	
 	@Column({ nullable: true })
 	icon?: string;
-
-	@Column()
+	
+	@Column({ nullable: true })
 	description: string;
-
-	@Column({ type: "simple-array", nullable: true })
-	rpc_origins?: string[];
-
+	
+	@Column({ nullable: true })
+	summary: string = "";
+	
+	@Column({ type: "simple-json", nullable: true })
+	type?: any;
+	
 	@Column()
-	bot_public: boolean;
-
+	hook: boolean = true;
+	
+	@Column()
+	bot_public?: boolean = true;
+	
+	@Column()
+	bot_require_code_grant?: boolean = false;
+	
 	@Column()
-	bot_require_code_grant: boolean;
+	verify_key: string;
+	
+	@JoinColumn({ name: "owner_id" })
+	@ManyToOne(() => User)
+	owner: User;
+	
+	@Column()
+	flags: number = 0;
+	
+	@Column({ type: "simple-array", nullable: true })
+	redirect_uris: string[] = [];
+	
+	@Column({ nullable: true })
+	rpc_application_state: number = 0;
+	
+	@Column({ nullable: true })
+	store_application_state: number = 1;
+	
+	@Column({ nullable: true })
+	verification_state: number = 1;
+	
+	@Column({ nullable: true })
+	interactions_endpoint_url?: string;
+	
+	@Column({ nullable: true })
+	integration_public: boolean = true;
+	
+	@Column({ nullable: true })
+	integration_require_code_grant: boolean = false;
+	
+	@Column({ nullable: true })
+	discoverability_state: number = 1;
+	
+	@Column({ nullable: true })
+	discovery_eligibility_flags: number = 2240;
+	
+	@JoinColumn({ name: "bot_user_id" })
+	@OneToOne(() => User)
+	bot?: User;
+	
+	@Column({ type: "simple-array", nullable: true })
+	tags?: string[];
+	
+	@Column({ nullable: true })
+	cover_image?: string; // the application's default rich presence invite cover image hash
+	
+	@Column({ type: "simple-json", nullable: true })
+	install_params?: {scopes: string[], permissions: string};
 
 	@Column({ nullable: true })
 	terms_of_service_url?: string;
@@ -30,15 +86,20 @@ export class Application extends BaseClass {
 	@Column({ nullable: true })
 	privacy_policy_url?: string;
 
-	@JoinColumn({ name: "owner_id" })
-	@ManyToOne(() => User)
-	owner?: User;
+	//just for us
 
-	@Column({ nullable: true })
-	summary?: string;
+	//@Column({ type: "simple-array", nullable: true })
+	//rpc_origins?: string[];
+	
+	//@JoinColumn({ name: "guild_id" })
+	//@ManyToOne(() => Guild)
+	//guild?: Guild; // if this application is a game sold, this field will be the guild to which it has been linked
 
-	@Column()
-	verify_key: string;
+	//@Column({ nullable: true })
+	//primary_sku_id?: string; // if this application is a game sold, this field will be the id of the "Game SKU" that is created,
+
+	//@Column({ nullable: true })
+	//slug?: string; // if this application is a game sold, this field will be the URL slug that links to the store page
 
 	@JoinColumn({ name: "team_id" })
 	@ManyToOne(() => Team, {
@@ -46,22 +107,7 @@ export class Application extends BaseClass {
 	})
 	team?: Team;
 
-	@JoinColumn({ name: "guild_id" })
-	@ManyToOne(() => Guild)
-	guild: Guild; // if this application is a game sold, this field will be the guild to which it has been linked
-
-	@Column({ nullable: true })
-	primary_sku_id?: string; // if this application is a game sold, this field will be the id of the "Game SKU" that is created,
-
-	@Column({ nullable: true })
-	slug?: string; // if this application is a game sold, this field will be the URL slug that links to the store page
-
-	@Column({ nullable: true })
-	cover_image?: string; // the application's default rich presence invite cover image hash
-
-	@Column()
-	flags: string; // the application's public flags
-}
+  }
 
 export interface ApplicationCommand {
 	id: string;
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 138d94a1..577e13f7 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -253,9 +253,7 @@ export class User extends BaseClass {
 		});
 	}
 
-	private static async generateDiscriminator(
-		username: string,
-	): Promise<string | undefined> {
+	public static async generateDiscriminator(username: string): Promise<string | undefined> {
 		if (Config.get().register.incrementingDiscriminators) {
 			// discriminator will be incrementally generated
 
diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts
index 5e474d9e..36eedbfc 100644
--- a/src/util/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -100,7 +100,7 @@ export interface ReadyEventData {
 	};
 	application?: {
 		id: string;
-		flags: string;
+		flags: number;
 	};
 	merged_members?: PublicMember[][];
 	// probably all users who the user is in contact with