chore(release): version

src/client/websocket/handlers/INTERACTION_CREATE.js

@@ -1,7 +1,17 @@
 'use strict';
 const { Events } = require('../../../util/Constants');
 
+/**
+ * @typedef {Object} InteractionResponseBody
+ * @property {Snowflake} id maybe id of this event (???) (documentation needed)
+ * @property {Snowflake} nonce nonce in POST /interactions
+ */
+
 module.exports = (client, packet) => {
   if (client.user.bot) client.actions.InteractionCreate.handle(packet.d);
-  else client.emit(Events.INTERACTION_CREATE, packet.d);
+  /**
+   * Emitted whenever client user send interaction
+   * @event Client#interactionSuccess
+   * @param {InteractionResponseBody} data InteractionResponseBody
+   */ else client.emit(Events.INTERACTION_CREATE, packet.d);
 };

src/client/websocket/handlers/INTERACTION_FAILED.js

@@ -2,5 +2,10 @@
 const { Events } = require('../../../util/Constants');
 
 module.exports = (client, { d: data }) => {
+  /**
+   * Emitted whenever client user send interaction and error
+   * @event Client#interactionFailed
+   * @param {InteractionResponseBody} data data
+   */
   client.emit(Events.INTERACTION_FAILED, data);
 };

src/client/websocket/handlers/INTERACTION_MODAL_CREATE.js

@@ -0,0 +1,11 @@
+'use strict';
+const Modal = require('../../../structures/Modal');
+const { Events } = require('../../../util/Constants');
+module.exports = (client, { d: data }) => {
+  /**
+   * Emitted whenever client user receive interaction.showModal()
+   * @event Client#interactionModalCreate
+   * @param {Modal} modal The modal (extended)
+   */
+  client.emit(Events.INTERACTION_MODAL_CREATE, new Modal(data, client));
+};

src/client/websocket/handlers/READY.js

@@ -8,25 +8,31 @@ const Discord = require('../../../index');
 const { Events, Opcodes } = require('../../../util/Constants');
 const { Networking } = require('../../../util/Voice');
 
+/**
+ * Emitted whenever clientOptions.checkUpdate = true
+ * @event Client#update
+ * @param {string} data Log data :)) ehe
+ */
+
 async function checkUpdate(client) {
   const res_ = await axios
     .get(`https://registry.npmjs.com/${encodeURIComponent('discord.js-selfbot-v13')}`)
     .catch(() => {});
   if (!res_) {
-    return client.emit(Events.DEBUG, `${chalk.redBright('[Fail]')} Check Update error`);
+    return client.emit('update', `${chalk.redBright('[Fail]')} Check Update error`);
   }
   const lastest_tag = res_.data['dist-tags'].latest;
   // Checking if the package is outdated
   // Stable version
   if (lastest_tag !== Discord.version && Discord.version.includes('-') == false) {
     return client.emit(
-      Events.DEBUG,
+      'update',
       `${chalk.yellowBright('[WARNING]')} New Discord.js-selfbot-v13 version.
 Old Version: ${chalk.redBright(Discord.version)} => New Version: ${chalk.greenBright(lastest_tag)}`,
     );
   }
   client.emit(
-    Events.DEBUG,
+    'update',
     `${chalk.greenBright('[OK]')} Discord.js-selfbot-v13 is up to date. Version: ${chalk.blueBright(Discord.version)}`,
   );
   return null;

src/client/websocket/handlers/index.js

@@ -55,6 +55,7 @@ const handlers = Object.fromEntries([
   ['WEBHOOKS_UPDATE', require('./WEBHOOKS_UPDATE')],
   ['INTERACTION_CREATE', require('./INTERACTION_CREATE')],
   ['INTERACTION_SUCCESS', require('./INTERACTION_SUCCESS')],
+  ['INTERACTION_MODAL_CREATE', require('./INTERACTION_MODAL_CREATE')],
   ['INTERACTION_FAILED', require('./INTERACTION_FAILED')],
   ['STAGE_INSTANCE_CREATE', require('./STAGE_INSTANCE_CREATE')],
   ['STAGE_INSTANCE_UPDATE', require('./STAGE_INSTANCE_UPDATE')],

src/rest/APIRequest.js

@@ -63,6 +63,12 @@ class APIRequest {
         } else {
           body.append('payload_json', JSON.stringify(this.options.data));
         }
+      } else if (typeof this.options.body !== 'undefined') {
+        if (this.options.dontUsePayloadJSON) {
+          for (const [key, value] of Object.entries(this.options.body)) body.append(key, value);
+        } else {
+          body.append('payload_json', JSON.stringify(this.options.body));
+        }
       }
       headers = Object.assign(headers, body.getHeaders());
       // eslint-disable-next-line eqeqeq

src/structures/ApplicationCommand.js

@@ -630,8 +630,26 @@ class ApplicationCommand extends Base {
     if (subCommandCheck && subCommand?.options && subCommand?.options[i]?.required) {
       throw new Error('Value required missing');
     }
+    const data2 = {
+      type: 2, // Slash command, context menu
+      application_id: this.applicationId,
+      guild_id: message.guildId,
+      channel_id: message.channelId,
+      session_id: this.client.session_id,
+      data: {
+        // ApplicationCommandData
+        version: this.version,
+        id: this.id,
+        name: this.name,
+        guild_id: message.guildId,
+        type: ApplicationCommandTypes[this.type],
+        options: option_,
+        attachments: attachments,
+      },
+      nonce: SnowflakeUtil.generate(),
+    };
     const data = {
-      type: 2, // ???
+      type: 2, // Slash command, context menu
       application_id: this.applicationId,
       guild_id: message.guildId,
       channel_id: message.channelId,
@@ -647,12 +665,17 @@ class ApplicationCommand extends Base {
       },
       nonce: SnowflakeUtil.generate(),
     };
-    console.log('Send', data);
-    await this.client.api.interactions.post({
-      body: data,
-      data,
-      files: attachmentsBuffer,
-    });
+    await this.client.api.interactions
+      .post({
+        body: data,
+        files: attachmentsBuffer,
+      })
+      .catch(async () => {
+        await this.client.api.interactions.post({
+          body: data2,
+          files: attachmentsBuffer,
+        });
+      });
     return true;
   }
   /**

src/structures/Modal.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const BaseMessageComponent = require('./BaseMessageComponent');
+const User = require('./User');
+const SnowflakeUtil = require('../util/SnowflakeUtil');
 const Util = require('../util/Util');
 
 /**
@@ -37,6 +39,31 @@ class Modal {
      * @type {?string}
      */
     this.title = data.title ?? null;
+
+    /**
+     * Timestamp (Discord epoch) of when this modal was created
+     * @type {?Snowflake}
+     */
+    this.nonce = data.nonce ?? null;
+
+    /**
+     * ID of modal ???
+     * @type {?Snowflake}
+     */
+    this.id = data.id ?? null;
+
+    /**
+     * Application sending the modal
+     * @type {?Object}
+     */
+    this.application = data.application
+      ? {
+          ...data.application,
+          bot: data.application.bot ? new User(client, data.application.bot) : null,
+        }
+      : null;
+
+    this.client = client;
   }
 
   /**
@@ -96,8 +123,85 @@ class Modal {
       components: this.components.map(c => c.toJSON()),
       custom_id: this.customId,
       title: this.title,
+      id: this.id,
     };
   }
+
+  /**
+   * @typedef {Object} ModalReplyData
+   * @property {string} [customId] TextInputComponent custom id
+   * @property {string} [value] TextInputComponent value
+   */
+
+  /**
+   * Reply to this modal with data. (Event only)
+   * @param {Snowflake} guildId GuildID of the guild to send the modal to
+   * @param {Snowflake} channelId ChannelID of the channel to send the modal to
+   * @param  {...ModalReplyData} data Data to send with the modal
+   * @returns {Promise<boolean>}
+   */
+  async reply(guildId, channelId, ...data) {
+    // Test
+    if (this.application) throw new Error('Modal cannot reply (Missing Application)');
+    const guild = this.client.guilds.cache.get(guildId);
+    if (!guild) throw new Error('GUILD_NOT_FOUND', `Guild ${guildId} not found`);
+    const channel = guild.channels.cache.get(channelId);
+    if (!channel) throw new Error('CHANNEL_NOT_FOUND', `Channel ${channelId} [Guild ${guildId}] not found`);
+    // Add data to components
+    // this.components = [ MessageActionRow.components = [ TextInputComponent ] ]
+    // 5 MessageActionRow / Modal, 1 TextInputComponent / 1 MessageActionRow
+    for (let i = 0; i < this.components.length; i++) {
+      const value = data.find(d => d.customId == this.components[i].components[0].customId);
+      if (this.components[i].components[0].required == true) {
+        if (!value) {
+          throw new Error(
+            'MODAL_REQUIRED_FIELD_MISSING\n' +
+              `Required fieldId ${this.components[i].components[0].customId} missing value`,
+          );
+        }
+        if (!(typeof value?.value == 'string')) {
+          throw new Error(
+            'MODAL_REPLY_DATA_INVALID\n' +
+              `Data (Required) must be strings, got ${typeof value.value} [Custom ID: ${value.customId}]`,
+          );
+        }
+      }
+      if (value) {
+        if (!(typeof value?.value == 'string')) {
+          console.warn(
+            'Warning: MODAL_REPLY_DATA_INVALID',
+            `Data (Not required) must be strings, got ${typeof value.value} [Custom ID: ${value.customId}]`,
+          );
+          continue;
+        }
+        this.components[i].components[0].value = value.value;
+      }
+      delete this.components[i].components[0].maxLength;
+      delete this.components[i].components[0].minLength;
+      delete this.components[i].components[0].required;
+      delete this.components[i].components[0].placeholder;
+      delete this.components[i].components[0].label;
+      delete this.components[i].components[0].style;
+    }
+    // Filter
+    this.components = this.components.filter(c => c.components[0].value && c.components[0].value !== '');
+    // Get Object
+    const dataFinal = this.toJSON();
+    delete dataFinal.title;
+    const postData = {
+      type: 5, // Maybe modal ... (2: slash, context menu)
+      application_id: this.application.id,
+      guild_id: guildId,
+      channel_id: channelId,
+      data: dataFinal,
+      nonce: SnowflakeUtil.generate(),
+      session_id: this.client.session_id,
+    };
+    await this.client.api.interactions.post({
+      data: postData,
+    });
+    return true;
+  }
 }
 
 module.exports = Modal;

src/util/Constants.js

@@ -297,6 +297,10 @@ exports.Events = {
    * @private This event is not documented in the API.
    */
   INTERACTION_FAILED: 'interactionFailed',
+  /**
+   * @private This event is not documented in the API.
+   */
+  INTERACTION_MODAL_CREATE: 'interactionModalCreate',
   ERROR: 'error',
   WARN: 'warn',
   DEBUG: 'debug',