From f49f70a4ebacf657f22d73043e3a504710821249 Mon Sep 17 00:00:00 2001
From: Suneet Tipirneni <77477100+suneettipirneni@users.noreply.github.com>
Date: Mon, 30 Aug 2021 06:55:39 -0400
Subject: [PATCH] fix: await message component collectors should return
 component interactions not collectors (#6562)

---
 typings/index.d.ts | 10 +++++++++-
 typings/tests.ts   | 10 +++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index 39dc7b1c0a47..70ccaeeb370e 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1135,6 +1135,14 @@ type InteractionCollectorReturnType<T extends MessageComponentType | MessageComp
   ? ConditionalInteractionCollectorType<MappedInteractionCollectorOptions[T]>
   : InteractionCollector<MessageComponentInteraction>;
 
+type InteractionReturnType<T extends MessageComponentType | MessageComponentTypes | undefined> = T extends
+  | MessageComponentType
+  | MessageComponentTypes
+  ? MappedInteractionCollectorOptions[T] extends InteractionCollectorOptions<infer Item>
+    ? Item
+    : never
+  : MessageComponentInteraction;
+
 type MessageCollectorOptionsParams<T> =
   | ({ componentType?: T } & InteractionCollectorOptionsResolvable)
   | InteractionCollectorOptions<MessageComponentInteraction>;
@@ -1192,7 +1200,7 @@ export class Message extends Base {
   public reference: MessageReference | null;
   public awaitMessageComponent<T extends MessageComponentType | MessageComponentTypes | undefined = undefined>(
     options?: AwaitMessageCollectorOptionsParams<T>,
-  ): Promise<InteractionCollectorReturnType<T>>;
+  ): Promise<InteractionReturnType<T>>;
   public awaitReactions(options?: AwaitReactionsOptions): Promise<Collection<Snowflake | string, MessageReaction>>;
   public createReactionCollector(options?: ReactionCollectorOptions): ReactionCollector;
   public createMessageComponentCollector<
diff --git a/typings/tests.ts b/typings/tests.ts
index 307fcc31680d..8eea53e86303 100644
--- a/typings/tests.ts
+++ b/typings/tests.ts
@@ -494,21 +494,17 @@ client.on('messageCreate', message => {
 
   // Verify that buttons interactions are inferred.
   const buttonCollector = message.createMessageComponentCollector({ componentType: 'BUTTON' });
-  assertType<Promise<InteractionCollector<ButtonInteraction>>>(
-    message.awaitMessageComponent({ componentType: 'BUTTON' }),
-  );
+  assertType<Promise<ButtonInteraction>>(message.awaitMessageComponent({ componentType: 'BUTTON' }));
   assertType<InteractionCollector<ButtonInteraction>>(buttonCollector);
 
   // Verify that select menus interaction are inferred.
   const selectMenuCollector = message.createMessageComponentCollector({ componentType: 'SELECT_MENU' });
-  assertType<Promise<InteractionCollector<SelectMenuInteraction>>>(
-    message.awaitMessageComponent({ componentType: 'SELECT_MENU' }),
-  );
+  assertType<Promise<SelectMenuInteraction>>(message.awaitMessageComponent({ componentType: 'SELECT_MENU' }));
   assertType<InteractionCollector<SelectMenuInteraction>>(selectMenuCollector);
 
   // Verify that message component interactions are default collected types.
   const defaultCollector = message.createMessageComponentCollector();
-  assertType<Promise<InteractionCollector<MessageComponentInteraction>>>(message.awaitMessageComponent());
+  assertType<Promise<MessageComponentInteraction>>(message.awaitMessageComponent());
   assertType<InteractionCollector<MessageComponentInteraction>>(defaultCollector);
 
   // Verify that additional options don't affect default collector types.