From 5f61e8e66b5028dc09fdd32bc9df5c0fe5a05210 Mon Sep 17 00:00:00 2001
From: MARCROCK22 <marcos22dev@gmail.com>
Date: Sun, 2 Jun 2024 15:37:45 +0000
Subject: [PATCH] fix: message structure types

---
 src/client/collectors.ts  |  4 ++--
 src/structures/Message.ts | 20 +++++---------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/client/collectors.ts b/src/client/collectors.ts
index c526d13..db4f2c2 100644
--- a/src/client/collectors.ts
+++ b/src/client/collectors.ts
@@ -43,12 +43,12 @@ export class Collectors {
 	}
 
 	create<T extends SnakeCaseClientNameEvents>(options: RunData<T>['options']) {
+		const nonce = this.generateRandomUUID(options.event);
+
 		if (!this.values.has(options.event)) {
 			this.values.set(options.event, []);
 		}
 
-		const nonce = this.generateRandomUUID(options.event);
-
 		this.values.get(options.event)!.push({
 			options: {
 				...options,
diff --git a/src/structures/Message.ts b/src/structures/Message.ts
index baabe22..f4d5d7f 100644
--- a/src/structures/Message.ts
+++ b/src/structures/Message.ts
@@ -24,11 +24,10 @@ export type MessageData = APIMessage | GatewayMessageCreateDispatchData;
 
 export interface BaseMessage
 	extends DiscordBase,
-		ObjectToLower<Omit<MessageData, 'timestamp' | 'author' | 'mentions' | 'components' | 'poll' | 'embeds'>> {}
-export class BaseMessage extends DiscordBase {
-	guildId: string | undefined;
+		ObjectToLower<Omit<MessageData, 'timestamp' | 'author' | 'mentions' | 'components' | 'poll' | 'embeds'>> {
 	timestamp?: number;
-	author!: User;
+	guildId?: string;
+	author: User;
 	member?: GuildMember;
 	components: MessageActionRowComponent<ActionRowMessageComponents>[];
 	poll?: Poll;
@@ -37,6 +36,8 @@ export class BaseMessage extends DiscordBase {
 		channels: APIChannelMention[];
 		users: (GuildMember | User)[];
 	};
+}
+export class BaseMessage extends DiscordBase {
 	embeds: InMessageEmbed[];
 
 	constructor(client: UsingClient, data: MessageData) {
@@ -77,21 +78,10 @@ export class BaseMessage extends DiscordBase {
 	}
 
 	private patch(data: MessageData) {
-		if ('guild_id' in data) {
-			this.guildId = data.guild_id;
-		}
-
-		if (data.type !== undefined) {
-			this.type = data.type;
-		}
-
 		if ('timestamp' in data && data.timestamp) {
 			this.timestamp = Date.parse(data.timestamp);
 		}
 
-		if ('application_id' in data) {
-			this.applicationId = data.application_id;
-		}
 		if ('author' in data && data.author) {
 			this.author = new User(this.client, data.author);
 		}