From 06f5210f58bbba6102173033a9f1e6fb004fdf5d Mon Sep 17 00:00:00 2001
From: Koyamie <koyamie1@gmail.com>
Date: Fri, 14 Jan 2022 00:20:45 +0100
Subject: [PATCH] fix(ApplicationCommand): use new ApplicationCommandOptionType
 enums (#7257)

---
 .../src/structures/BaseMessageComponent.js          | 13 +++++++------
 .../discord.js/src/structures/MessageActionRow.js   |  4 ++--
 packages/discord.js/src/structures/MessageButton.js |  8 ++++----
 .../discord.js/src/structures/MessageSelectMenu.js  |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/discord.js/src/structures/BaseMessageComponent.js b/packages/discord.js/src/structures/BaseMessageComponent.js
index c2470e0c1..aa873fab6 100644
--- a/packages/discord.js/src/structures/BaseMessageComponent.js
+++ b/packages/discord.js/src/structures/BaseMessageComponent.js
@@ -1,7 +1,8 @@
 'use strict';
 
+const { ComponentType } = require('discord-api-types/v9');
 const { TypeError } = require('../errors');
-const { MessageComponentTypes, Events } = require('../util/Constants');
+const { Events } = require('../util/Constants');
 
 /**
  * Represents an interactive component of a Message. It should not be necessary to construct this directly.
@@ -61,20 +62,20 @@ class BaseMessageComponent {
     let component;
     let type = data.type;
 
-    if (typeof type === 'string') type = MessageComponentTypes[type];
+    if (typeof type === 'string') type = ComponentType[type];
 
     switch (type) {
-      case MessageComponentTypes.ACTION_ROW: {
+      case ComponentType.ActionRow: {
         const MessageActionRow = require('./MessageActionRow');
         component = data instanceof MessageActionRow ? data : new MessageActionRow(data, client);
         break;
       }
-      case MessageComponentTypes.BUTTON: {
+      case ComponentType.Button: {
         const MessageButton = require('./MessageButton');
         component = data instanceof MessageButton ? data : new MessageButton(data);
         break;
       }
-      case MessageComponentTypes.SELECT_MENU: {
+      case ComponentType.SelectMenu: {
         const MessageSelectMenu = require('./MessageSelectMenu');
         component = data instanceof MessageSelectMenu ? data : new MessageSelectMenu(data);
         break;
@@ -96,7 +97,7 @@ class BaseMessageComponent {
    * @private
    */
   static resolveType(type) {
-    return typeof type === 'string' ? type : MessageComponentTypes[type];
+    return typeof type === 'string' ? type : ComponentType[type];
   }
 }
 
diff --git a/packages/discord.js/src/structures/MessageActionRow.js b/packages/discord.js/src/structures/MessageActionRow.js
index c44b32a60..8ad93f082 100644
--- a/packages/discord.js/src/structures/MessageActionRow.js
+++ b/packages/discord.js/src/structures/MessageActionRow.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { ComponentType } = require('discord-api-types/v9');
 const BaseMessageComponent = require('./BaseMessageComponent');
-const { MessageComponentTypes } = require('../util/Constants');
 
 /**
  * Represents an action row containing message components.
@@ -88,7 +88,7 @@ class MessageActionRow extends BaseMessageComponent {
   toJSON() {
     return {
       components: this.components.map(c => c.toJSON()),
-      type: MessageComponentTypes[this.type],
+      type: ComponentType[this.type],
     };
   }
 }
diff --git a/packages/discord.js/src/structures/MessageButton.js b/packages/discord.js/src/structures/MessageButton.js
index a94c1ec56..0eaad484b 100644
--- a/packages/discord.js/src/structures/MessageButton.js
+++ b/packages/discord.js/src/structures/MessageButton.js
@@ -1,8 +1,8 @@
 'use strict';
 
+const { ButtonStyle, ComponentType } = require('discord-api-types/v9');
 const BaseMessageComponent = require('./BaseMessageComponent');
 const { RangeError } = require('../errors');
-const { MessageButtonStyles, MessageComponentTypes } = require('../util/Constants');
 const Util = require('../util/Util');
 
 /**
@@ -138,8 +138,8 @@ class MessageButton extends BaseMessageComponent {
       disabled: this.disabled,
       emoji: this.emoji,
       label: this.label,
-      style: MessageButtonStyles[this.style],
-      type: MessageComponentTypes[this.type],
+      style: ButtonStyle[this.style],
+      type: ComponentType[this.type],
       url: this.url,
     };
   }
@@ -158,7 +158,7 @@ class MessageButton extends BaseMessageComponent {
    * @private
    */
   static resolveStyle(style) {
-    return typeof style === 'string' ? style : MessageButtonStyles[style];
+    return typeof style === 'string' ? style : ButtonStyle[style];
   }
 }
 
diff --git a/packages/discord.js/src/structures/MessageSelectMenu.js b/packages/discord.js/src/structures/MessageSelectMenu.js
index ae1e7a6d6..cab6c9a01 100644
--- a/packages/discord.js/src/structures/MessageSelectMenu.js
+++ b/packages/discord.js/src/structures/MessageSelectMenu.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { ComponentType } = require('discord-api-types/v9');
 const BaseMessageComponent = require('./BaseMessageComponent');
-const { MessageComponentTypes } = require('../util/Constants');
 const Util = require('../util/Util');
 
 /**
@@ -179,7 +179,7 @@ class MessageSelectMenu extends BaseMessageComponent {
       min_values: this.minValues,
       max_values: this.maxValues ?? (this.minValues ? this.options.length : undefined),
       options: this.options,
-      type: typeof this.type === 'string' ? MessageComponentTypes[this.type] : this.type,
+      type: typeof this.type === 'string' ? ComponentType[this.type] : this.type,
     };
   }