From 865f863e53dd1aaa18497abc179b0802119b2f8b Mon Sep 17 00:00:00 2001
From: MARCROCK22 <57925328+MARCROCK22@users.noreply.github.com>
Date: Wed, 27 Mar 2024 21:38:28 -0400
Subject: [PATCH] fix: incorrect guild_d

---
 src/client/oninteractioncreate.ts | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/client/oninteractioncreate.ts b/src/client/oninteractioncreate.ts
index 79a9cd3..8b1e058 100644
--- a/src/client/oninteractioncreate.ts
+++ b/src/client/oninteractioncreate.ts
@@ -29,8 +29,8 @@ export async function onInteractionCreate(
 		case InteractionType.ApplicationCommandAutocomplete:
 			{
 				const parentCommand = self.commands?.values.find(x => {
-					if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
-						return false;
+					if (body.data.guild_id) {
+						return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
 					}
 					return x.name === body.data.name;
 				});
@@ -38,7 +38,7 @@ export async function onInteractionCreate(
 					self,
 					body.data.options ?? [],
 					parentCommand as Command,
-					body.data.guild_id,
+					body.guild_id,
 					body.data.resolved as ContextOptionsResolved,
 				);
 				const interaction = new AutocompleteInteraction(self, body, __reply);
@@ -77,8 +77,8 @@ export async function onInteractionCreate(
 					case ApplicationCommandType.User:
 						{
 							const command = self.commands?.values.find(x => {
-								if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
-									return false;
+								if (body.data.guild_id) {
+									return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
 								}
 								return x.name === body.data.name;
 							}) as ContextMenuCommand;
@@ -134,19 +134,18 @@ export async function onInteractionCreate(
 						break;
 					case ApplicationCommandType.ChatInput:
 						{
-							const packetData = body.data;
 							const parentCommand = self.commands?.values.find(x => {
-								if (x.guild_id && !x.guild_id.includes(packetData.guild_id ?? '')) {
-									return false;
+								if (body.data.guild_id) {
+									return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
 								}
-								return x.name === packetData.name;
+								return x.name === body.data.name;
 							});
 							const optionsResolver = new OptionResolver(
 								self,
-								packetData.options ?? [],
+								body.data.options ?? [],
 								parentCommand as Command,
-								packetData.guild_id,
-								packetData.resolved as ContextOptionsResolved,
+								body.guild_id,
+								body.data.resolved as ContextOptionsResolved,
 							);
 							const interaction = BaseInteraction.from(self, body, __reply) as ChatInputCommandInteraction;
 							const command = optionsResolver.getCommand();