diff --git a/util/src/models/Activity.ts b/util/src/interfaces/Activity.ts
index 6b13477f..f5a3c270 100644
--- a/util/src/models/Activity.ts
+++ b/util/src/interfaces/Activity.ts
@@ -1,14 +1,3 @@
-import { User } from "./User";
-import { ClientStatus, Status } from "./Status";
-
-export interface Presence {
- user: User;
- guild_id?: string;
- status: Status;
- activities: Activity[];
- client_status: ClientStatus;
-}
-
export interface Activity {
name: string;
type: ActivityType;
diff --git a/util/oldModels/Event.ts b/util/src/interfaces/Event.ts
index 904522a8..1897706e 100644
--- a/util/oldModels/Event.ts
+++ b/util/src/interfaces/Event.ts
@@ -1,15 +1,17 @@
-import { ConnectedAccount, PublicUser, Relationship, User, UserSettings } from "./User";
-import { DMChannel, Channel } from "./Channel";
-import { Guild } from "./Guild";
-import { Member, PublicMember, UserGuildSettings } from "./Member";
-import { Emoji } from "./Emoji";
-import { Presence } from "../models/Activity";
-import { Role } from "./Role";
-import { Invite } from "./Invite";
-import { Message, PartialEmoji } from "./Message";
-import { VoiceState } from "./VoiceState";
-import { ApplicationCommand } from "./Application";
+import { PublicUser, User, UserSettings } from "../entities/User";
+import { Channel } from "../entities/Channel";
+import { Guild } from "../entities/Guild";
+import { Member, PublicMember, UserGuildSettings } from "../entities/Member";
+import { Emoji } from "../entities/Emoji";
+import { Role } from "../entities/Role";
+import { Invite } from "../entities/Invite";
+import { Message, PartialEmoji } from "../entities/Message";
+import { VoiceState } from "../entities/VoiceState";
+import { ApplicationCommand } from "../entities/Application";
import { Interaction } from "./Interaction";
+import { ConnectedAccount } from "../entities/ConnectedAccount";
+import { Relationship } from "../entities/Relationship";
+import { Presence } from "./Presence";
export interface Event {
guild_id?: string;
@@ -43,7 +45,7 @@ export interface ReadyEventData {
verified: boolean;
bot: boolean;
};
- private_channels: DMChannel[]; // this will be empty for bots
+ private_channels: Channel[]; // this will be empty for bots
session_id: string; // resuming
guilds: Guild[];
analytics_token?: string;
@@ -67,12 +69,12 @@ export interface ReadyEventData {
[number, [[number, [number, number]]]],
{ b: number; k: bigint[] }[]
][];
- guild_join_requests?: []; // ? what is this? this is new
+ guild_join_requests?: any[]; // ? what is this? this is new
shard?: [number, number];
user_settings?: UserSettings;
relationships?: Relationship[]; // TODO
read_state: {
- entries: []; // TODO
+ entries: any[]; // TODO
partial: boolean;
version: number;
};
diff --git a/util/oldModels/Interaction.ts b/util/src/interfaces/Interaction.ts
index 764247a5..3cafb2d5 100644
--- a/util/oldModels/Interaction.ts
+++ b/util/src/interfaces/Interaction.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, Embed } from "./Message";
+import { AllowedMentions, Embed } from "../entities/Message";
export interface Interaction {
id: string;
diff --git a/util/src/interfaces/Presence.ts b/util/src/interfaces/Presence.ts
new file mode 100644
index 00000000..4a1ff038
--- /dev/null
+++ b/util/src/interfaces/Presence.ts
@@ -0,0 +1,10 @@
+import { ClientStatus, Status } from "./Status";
+import { Activity } from "./Activity";
+
+export interface Presence {
+ user_id: string;
+ guild_id?: string;
+ status: Status;
+ activities: Activity[];
+ client_status: ClientStatus;
+}
diff --git a/util/src/models/Status.ts b/util/src/interfaces/Status.ts
index c4dab586..c4dab586 100644
--- a/util/src/models/Status.ts
+++ b/util/src/interfaces/Status.ts
diff --git a/util/src/interfaces/index.ts b/util/src/interfaces/index.ts
new file mode 100644
index 00000000..ab7fa429
--- /dev/null
+++ b/util/src/interfaces/index.ts
@@ -0,0 +1,5 @@
+export * from "./Activity";
+export * from "./Presence";
+export * from "./Interaction";
+export * from "./Event";
+export * from "./Status";
|
