Merge remote-tracking branch 'upstream/staging' into fix/categoryNames

1 files changed, 3 insertions, 3 deletions

diff --git a/util/src/interfaces/Event.ts b/src/util/interfaces/Event.ts

index 416082ed..be66c62f 100644
--- a/util/src/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -1,4 +1,4 @@
-import { PublicUser, User, UserSettings } from "../entities/User";
+import { PublicUser, User } from "../entities/User";
 import { Channel } from "../entities/Channel";
 import { Guild } from "../entities/Guild";
 import { Member, PublicMember, UserGuildSettings } from "../entities/Member";
@@ -12,7 +12,7 @@ import { Interaction } from "./Interaction";
 import { ConnectedAccount } from "../entities/ConnectedAccount";
 import { Relationship, RelationshipType } from "../entities/Relationship";
 import { Presence } from "./Presence";
-import { Sticker } from "..";
+import { Sticker, UserSettings } from "..";
 import { Activity, Status } from ".";
 
 export interface Event {
@@ -93,7 +93,7 @@ export interface ReadyEventData {
 	};
 	application?: {
 		id: string;
-		flags: string;
+		flags: number;
 	};
 	merged_members?: PublicMember[][];
 	// probably all users who the user is in contact with