fix: select menu interaction type according to select menu type

Author: davidabou

playground/harmonix.config.ts

@@ -1,5 +1,8 @@
 import { defineHarmonixConfig } from '../src'
 
 export default defineHarmonixConfig({
-  ownerIds: ['556083802628161546']
+  ownerIds: ['556083802628161546'],
+  client: {
+    intents: []
+  }
 })

playground/modals/form.ts

@@ -3,23 +3,21 @@ import { defineModal } from '../../src'
 export default defineModal(
   {
     title: 'Form',
-    textInputs: [
-      {
-        id: 'color',
+    inputs: {
+      color: {
         label: 'Favorite color',
-        placeholder: 'Enter your favorite color',
-        style: 'Short'
+        style: 'Short',
+        placeholder: 'Enter your favorite color'
       },
-      {
-        id: 'hobbies',
+      hobbies: {
         label: 'Hobbies',
-        placeholder: 'Enter your hobbies',
-        style: 'Paragraph'
+        style: 'Paragraph',
+        placeholder: 'Enter your hobbies'
       }
-    ]
+    }
   },
-  (interaction) => {
-    const color = interaction.fields.getTextInputValue('color')
+  (interaction, context) => {
+    const { color } = context.inputs
 
     interaction.reply(`Submitted color: ${color}`)
   }

src/define.ts

@@ -11,19 +11,22 @@ import type {
   DefineEventWithOptions,
   DefinePrecondition,
   DefinePreconditionWithName,
-  DefineSelectMenu,
   EventCallback,
   EventOptions,
   HarmonixCommand,
   HarmonixConfig,
   HarmonixContextMenu,
   HarmonixEvent,
   HarmonixModal,
+  HarmonixSelectMenu,
   ModalCallback,
   ModalConfig,
   ModalInputs,
   OptionsDef,
-  PreconditionCallback
+  PreconditionCallback,
+  SelectMenuCallback,
+  SelectMenuConfig,
+  SelectMenuType
 } from './types'
 
 export const defineHarmonixConfig = (config: HarmonixConfig) => {
@@ -106,7 +109,10 @@ export const defineModal = <T extends ModalInputs = ModalInputs>(
   return { config, callback }
 }
 
-export const defineSelectMenu: DefineSelectMenu = (config, callback) => {
+export const defineSelectMenu = <T extends SelectMenuType = SelectMenuType>(
+  config: SelectMenuConfig & { type?: T },
+  callback: SelectMenuCallback<T>
+): HarmonixSelectMenu<T> => {
   return { config, callback }
 }
 

src/gets.ts

@@ -1,12 +1,33 @@
 import type {
   APISelectMenuDefaultValue,
-  AnySelectMenuInteraction,
+  ChannelSelectMenuInteraction,
   ChannelType,
   ComponentEmojiResolvable,
-  SelectMenuDefaultValueType
+  MentionableSelectMenuInteraction,
+  RoleSelectMenuInteraction,
+  SelectMenuDefaultValueType,
+  StringSelectMenuInteraction,
+  UserSelectMenuInteraction
 } from 'discord.js'
 
-type SelectMenuCallback = (interaction: AnySelectMenuInteraction) => void
+export type SelectMenuType =
+  | 'String'
+  | 'User'
+  | 'Channel'
+  | 'Role'
+  | 'Mentionable'
+
+export type SelectMenuCallback<T extends SelectMenuType = SelectMenuType> = (
+  interaction: T extends 'String'
+    ? StringSelectMenuInteraction
+    : T extends 'User'
+      ? UserSelectMenuInteraction
+      : T extends 'Channel'
+        ? ChannelSelectMenuInteraction
+        : T extends 'Role'
+          ? RoleSelectMenuInteraction
+          : MentionableSelectMenuInteraction
+) => void
 
 export interface StringSelectMenuConfig {
   type: 'String'
@@ -59,14 +80,9 @@ export type SelectMenuConfig = BaseSelectMenuConfig &
     | MentionableSelectMenuConfig
   )
 
-export type DefineSelectMenu = (
-  config: SelectMenuConfig,
-  callback: SelectMenuCallback
-) => HarmonixSelectMenu
-
 export type HarmonixSelectMenuInput = string | HarmonixSelectMenu
 
-export interface HarmonixSelectMenu {
+export interface HarmonixSelectMenu<T extends SelectMenuType = SelectMenuType> {
   config: SelectMenuConfig
-  callback: SelectMenuCallback
+  callback: SelectMenuCallback<T>
 }