djs-selfbot-v13 3.1.7 → 3.1.8

package/src/structures/Modal.js

@@ -2,24 +2,15 @@
 
 const { setTimeout } = require('node:timers');
 const BaseMessageComponent = require('./BaseMessageComponent');
-const User = require('./User');
+const { InteractionTypes, Events } = require('../util/Constants');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
-const Util = require('../util/Util');
 
 /**
  * Represents a modal (form) to be shown in response to an interaction
  */
 class Modal {
   /**
-   * @typedef {Object} ModalOptions
-   * @property {string} [customId] A unique string to be sent in the interaction when clicked
-   * @property {string} [title] The title to be displayed on this modal
-   * @property {Array<(MessageActionRow|MessageActionRowOptions)>} [components]
-   * Action rows containing interactive components for the modal (text input components)
-   */
-
-  /**
-   * @param {Modal|ModalOptions} data Modal to clone or raw data
+   * @param {Object} data Modal to clone or raw data
    * @param {Client} client The client constructing this Modal, if provided
    */
   constructor(data = {}, client = null) {
@@ -33,106 +24,69 @@ class Modal {
      * A unique string to be sent in the interaction when submitted
      * @type {?string}
      */
-    this.customId = data.custom_id ?? data.customId ?? null;
+    this.customId = data.custom_id;
 
     /**
      * The title to be displayed on this modal
      * @type {?string}
      */
-    this.title = data.title ?? null;
+    this.title = data.title;
 
     /**
      * Timestamp (Discord epoch) of when this modal was created
-     * @type {?Snowflake}
+     * @type {Snowflake}
      */
-    this.nonce = data.nonce ?? null;
+    this.nonce = data.nonce;
 
     /**
      * ID slash / button / menu when modal is displayed
-     * @type {?Snowflake}
+     * @type {Snowflake}
      */
-    this.id = data.id ?? null;
+    this.id = data.id;
 
     /**
      * Application sending the modal
-     * @type {?Object}
+     * @type {Snowflake}
      */
-    this.application = data.application
-      ? {
-          ...data.application,
-          bot: data.application.bot ? new User(client, data.application.bot, data.application) : null,
-        }
-      : null;
-
-    this.client = client;
-  }
+    this.applicationId = data.application.id;
 
-  /**
-   * Get Interaction Response
-   * @type {?InteractionResponse}
-   * @readonly
-   */
-  get sendFromInteraction() {
-    if (this.id && this.nonce && this.client) {
-      const cache = this.client._interactionCache.get(this.nonce);
-      const channel = cache.guildId
-        ? this.client.guilds.cache.get(cache.guildId)?.channels.cache.get(cache.channelId)
-        : this.client.channels.cache.get(cache.channelId);
-      return channel.interactions.cache.get(this.id);
-    }
-    return null;
-  }
-
-  /**
-   * Adds components to the modal.
-   * @param {...MessageActionRowResolvable[]} components The components to add
-   * @returns {Modal}
-   */
-  addComponents(...components) {
-    this.components.push(...components.flat(Infinity).map(c => BaseMessageComponent.create(c)));
-    return this;
-  }
+    /**
+     * The id of the channel the message was sent in
+     * @type {Snowflake}
+     */
+    this.channelId = data.channel_id;
 
-  /**
-   * Sets the components of the modal.
-   * @param {...MessageActionRowResolvable[]} components The components to set
-   * @returns {Modal}
-   */
-  setComponents(...components) {
-    this.spliceComponents(0, this.components.length, components);
-    return this;
+    Object.defineProperty(this, 'client', {
+      value: client,
+      writable: false,
+    });
   }
 
   /**
-   * Sets the custom id for this modal
-   * @param {string} customId A unique string to be sent in the interaction when submitted
-   * @returns {Modal}
+   * The id of the guild the message was sent in, if any
+   * @type {?Snowflake}
+   * @readonly
    */
-  setCustomId(customId) {
-    this.customId = Util.verifyString(customId, RangeError, 'MODAL_CUSTOM_ID');
-    return this;
+  get guildId() {
+    return this.client.channels.cache.get(this.channelId)?.guildId || null;
   }
 
   /**
-   * Removes, replaces, and inserts components in the modal.
-   * @param {number} index The index to start at
-   * @param {number} deleteCount The number of components to remove
-   * @param {...MessageActionRowResolvable[]} [components] The replacing components
-   * @returns {Modal}
+   * The channel that the message was sent in
+   * @type {TextBasedChannels}
+   * @readonly
    */
-  spliceComponents(index, deleteCount, ...components) {
-    this.components.splice(index, deleteCount, ...components.flat(Infinity).map(c => BaseMessageComponent.create(c)));
-    return this;
+  get channel() {
+    return this.client.channels.resolve(this.channelId);
   }
 
   /**
-   * Sets the title of this modal
-   * @param {string} title The title to be displayed on this modal
-   * @returns {Modal}
+   * The guild the message was sent in (if in a guild channel)
+   * @type {?Guild}
+   * @readonly
    */
-  setTitle(title) {
-    this.title = Util.verifyString(title, RangeError, 'MODAL_TITLE');
-    return this;
+  get guild() {
+    return this.client.guilds.resolve(this.guildId) ?? this.channel?.guild ?? null;
   }
 
   toJSON() {
@@ -144,136 +98,77 @@ class Modal {
     };
   }
 
-  /**
-   * @typedef {Object} TextInputComponentReplyData
-   * @property {string} [customId] TextInputComponent custom id
-   * @property {string} [value] TextInputComponent value
-   */
-
-  /**
-   * @typedef {Object} ModalReplyData
-   * @property {?GuildResolvable} [guild] Guild to send the modal to
-   * @property {?TextChannelResolvable} [channel] User to send the modal to
-   * @property {?TextInputComponentReplyData[]} [data] Reply data
-   */
-
   /**
    * Reply to this modal with data. (Event only)
-   * @param  {ModalReplyData} data Data to send with the modal
-   * @returns {Promise<InteractionResponse>}
+   * @returns {Promise<Message|Modal>}
    * @example
    * client.on('interactionModalCreate', modal => {
-   * // 1.
-   *  modal.reply({
-   *     data: [
-   *         {
-   *             customId: 'code',
-   *             value: '1+1'
-   *         }, {
-   *             customId: 'message',
-   *             value: 'hello'
-   *         }
-   *     ],
-   *    channel: 'id', // optional
-   *    guild: 'id', // optional
-   *  })
-   * // or 2.
-   * modal.components[0].components[0].setValue('1+1');
-   * modal.components[1].components[0].setValue('hello');
-   * modal.reply();
+   *    // Modal > ActionRow > TextInput
+   *    modal.components[0].components[0].setValue('1+1');
+   *    modal.components[1].components[0].setValue('hello');
+   *    modal.reply();
    * })
    */
-  async reply(data = {}) {
-    if (!this.application) throw new Error('Modal cannot reply (Missing Application)');
-    const data_cache = this.sendFromInteraction;
-    const guild = this.client.guilds.resolveId(data?.guild) || data_cache.guildId || null;
-    const channel = this.client.channels.resolveId(data?.channel) || data_cache.channelId;
-    if (!channel) throw new Error('Modal cannot reply (Missing data)');
-    // Add data to components
-    // this.components = [ MessageActionRow.components = [ TextInputComponent ] ]
-    // 5 MessageActionRow / Modal, 1 TextInputComponent / 1 MessageActionRow
-    if (Array.isArray(data?.data) && data?.data?.length > 0) {
-      for (let i = 0; i < this.components.length; i++) {
-        const value = data.data.find(d => d.customId == this.components[i].components[0].customId);
-        if (this.components[i].components[0].required == true && !value) {
-          throw new Error(
-            'MODAL_REQUIRED_FIELD_MISSING\n' +
-              `Required fieldId ${this.components[i].components[0].customId} missing value`,
-          );
-        }
-        if (value) {
-          if (value?.value?.includes('\n') && this.components[i].components[0].style == 'SHORT') {
-            throw new Error(
-              'MODAL_REPLY_DATA_INVALID\n' +
-                `value must be a single line, got multiple lines [Custom ID: ${value.customId}]`,
-            );
-          }
-          this.components[i].components[0].setValue(value.value);
-        }
-      }
-    }
+  reply() {
+    if (!this.applicationId || !this.client || !this.channelId) throw new Error('Modal cannot reply');
     // Get Object
     const dataFinal = this.toJSON();
     dataFinal.components = dataFinal.components
       .map(c => {
-        delete c.components[0].max_length;
-        delete c.components[0].min_length;
-        delete c.components[0].required;
-        delete c.components[0].placeholder;
-        delete c.components[0].label;
-        delete c.components[0].style;
+        c.components[0] = {
+          type: c.components[0].type,
+          value: c.components[0].value,
+          custom_id: c.components[0].custom_id,
+        };
         return c;
       })
-      .filter(c => c.components[0].value && c.components[0].value !== '');
+      .filter(c => typeof c.components[0].value == 'string');
     delete dataFinal.title;
     const nonce = SnowflakeUtil.generate();
     const postData = {
-      type: 5, // Modal
-      application_id: this.application.id,
-      guild_id: guild || null,
-      channel_id: channel,
+      type: InteractionTypes.MODAL_SUBMIT, // Modal
+      application_id: this.applicationId,
+      guild_id: this.guildId,
+      channel_id: this.channelId,
       data: dataFinal,
       nonce,
-      session_id: this.client.session_id,
+      session_id: this.client.sessionId,
     };
-    await this.client.api.interactions.post({
+    this.client.api.interactions.post({
       data: postData,
     });
-    this.client._interactionCache.set(nonce, {
-      channelId: channel,
-      guildId: guild,
-      metadata: postData,
-    });
     return new Promise((resolve, reject) => {
+      const timeoutMs = 5_000;
+      // Waiting for MsgCreate / ModalCreate
       const handler = data => {
-        timeout.refresh();
-        if (data.metadata?.nonce !== nonce) return;
+        if (data.nonce !== nonce) return;
         clearTimeout(timeout);
-        this.client.removeListener('interactionResponse', handler);
+        this.client.removeListener(Events.MESSAGE_CREATE, handler);
+        this.client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
         this.client.decrementMaxListeners();
-        if (data.status) {
-          resolve(data.metadata);
-        } else {
-          reject(
-            new Error('INTERACTION_ERROR', {
-              cause: data,
-            }),
-          );
-        }
+        resolve(data);
       };
       const timeout = setTimeout(() => {
-        this.client.removeListener('interactionResponse', handler);
+        this.client.removeListener(Events.MESSAGE_CREATE, handler);
+        this.client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
         this.client.decrementMaxListeners();
-        reject(
-          new Error('INTERACTION_TIMEOUT', {
-            cause: postData,
-          }),
-        );
-      }, this.client.options.interactionTimeout).unref();
+        reject(new Error('INTERACTION_FAILED'));
+      }, timeoutMs).unref();
       this.client.incrementMaxListeners();
-      this.client.on('interactionResponse', handler);
+      this.client.on(Events.MESSAGE_CREATE, handler);
+      this.client.on(Events.INTERACTION_MODAL_CREATE, handler);
     });
   }
+
+  // TypeScript
+  /**
+   * Check data
+   * @type {boolean}
+   * @readonly
+   */
+  get isMessage() {
+    return false;
+  }
 }
 
 module.exports = Modal;

package/src/structures/Presence.js

@@ -90,8 +90,8 @@ class Presence extends Base {
 
     if ('activities' in data) {
       /**
-       * The activities of this presence
-       * @type {Activity[]}
+       * The activities of this presence (Always `Activity[]` if not ClientUser)
+       * @type {Activity[]|CustomStatus[]|RichPresence[]|SpotifyRPC[]}
        */
       this.activities = data.activities.map(activity => {
         if (fromClient === true) {

package/src/structures/RichPresence.js

@@ -1,11 +1,8 @@
 'use strict';
+const { randomUUID } = require('node:crypto');
 const { ActivityTypes } = require('../util/Constants');
 const { resolvePartialEmoji } = require('../util/Util');
 
-// eslint-disable-next-line
-const getUUID = () =>
-  ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, a => (a ^ ((Math.random() * 16) >> (a / 4))).toString(16));
-// Function check url valid (ok copilot)
 // eslint-disable-next-line
 const checkUrl = url => {
   try {
@@ -183,9 +180,17 @@ class RichPresence {
     this.buttons = data.buttons;
     this.metadata = data.metadata;
   }
+  /**
+   * @typedef {string} RichPresenceImage
+   * Support:
+   * - cdn.discordapp.com
+   * - media.discordapp.net
+   * - Asset ID (From https://discord.com/api/v9/oauth2/applications/:id/assets)
+   * - ExternalAssets (mp:external/)
+   */
   /**
    * Set the large image of this activity
-   * @param {?any} image The large image asset's id
+   * @param {?RichPresenceImage} image The large image asset's id
    * @returns {RichPresence}
    */
   setAssetsLargeImage(image) {
@@ -201,14 +206,7 @@ class RichPresence {
         .replace('http://media.discordapp.net/', 'mp:');
       //
       if (!image.startsWith('mp:') && !this.ipc) {
-        throw new Error(
-          'INVALID_URL',
-          `
-If you want to set the URL directly, it should be the Discord URL (cdn.discordapp.com | media.discordapp.net)
-Or follow these instructions:
-https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichPresence.md#method-3-custom-url-2378
-`,
-        );
+        throw new Error('INVALID_URL');
       }
     } else if (/^[0-9]{17,19}$/.test(image)) {
       // ID Assets
@@ -222,7 +220,7 @@ https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichP
   }
   /**
    * Set the small image of this activity
-   * @param {?any} image The small image asset's id
+   * @param {?RichPresenceImage} image The small image asset's id
    * @returns {RichPresence}
    */
   setAssetsSmallImage(image) {
@@ -238,14 +236,7 @@ https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichP
         .replace('http://media.discordapp.net/', 'mp:');
       //
       if (!image.startsWith('mp:') && !this.ipc) {
-        throw new Error(
-          'INVALID_URL',
-          `
-If you want to set the URL directly, it should be the Discord URL (cdn.discordapp.com | media.discordapp.net)
-Or follow these instructions:
-https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichPresence.md#method-3-custom-url-2378
-`,
-        );
+        throw new Error('INVALID_URL');
       }
     } else if (/^[0-9]{17,19}$/.test(image)) {
       // ID Assets
@@ -351,7 +342,7 @@ https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichP
       if (!party.max || typeof party.max != 'number') throw new Error('Party must have max number');
       if (!party.current || typeof party.current != 'number') throw new Error('Party must have current');
       if (party.current > party.max) throw new Error('Party current must be less than max number');
-      if (!party.id || typeof party.id != 'string') party.id = getUUID();
+      if (!party.id || typeof party.id != 'string') party.id = randomUUID();
       this.party = {
         size: [party.current, party.max],
         id: party.id,
@@ -488,16 +479,6 @@ https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/Documents/RichP
     }
   }
 
-  /**
-   * Get random UUID string (Util)
-   * @returns {string}
-   */
-  static getUUID() {
-    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, a =>
-      (a ^ ((Math.random() * 16) >> (a / 4))).toString(16),
-    );
-  }
-
   /**
    * Get Assets from a RichPresence (Util)
    * @param {Client} client Discord Client
@@ -718,5 +699,4 @@ module.exports = {
   CustomStatus,
   RichPresence,
   SpotifyRPC,
-  getUUID,
 };

package/src/structures/Role.js

@@ -4,6 +4,7 @@ const process = require('node:process');
 const Base = require('./Base');
 const { Error } = require('../errors');
 const Permissions = require('../util/Permissions');
+const RoleFlags = require('../util/RoleFlags');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 
 let deprecationEmittedForComparePositions = false;
@@ -142,6 +143,16 @@ class Role extends Base {
         this.tags.guildConnections = true;
       }
     }
+
+    if ('flags' in data) {
+      /**
+       * The flags of this role
+       * @type {Readonly<RoleFlags>}
+       */
+      this.flags = new RoleFlags(data.flags).freeze();
+    } else {
+      this.flags ??= new RoleFlags().freeze();
+    }
   }
 
   /**
@@ -228,8 +239,13 @@ class Role extends Base {
    * @readonly
    */
   get position() {
-    const sorted = this.guild._sortedRoles();
-    return [...sorted.values()].indexOf(sorted.get(this.id));
+    let count = 0;
+    for (const role of this.guild.roles.cache.values()) {
+      if (this.rawPosition > role.rawPosition) count++;
+      else if (this.rawPosition === role.rawPosition && BigInt(this.id) < BigInt(role.id)) count++;
+    }
+
+    return count;
   }
 
   /**

package/src/structures/SelectMenuInteraction.js

@@ -1,11 +1,9 @@
 'use strict';
 
-const { Collection } = require('@discordjs/collection');
 const MessageComponentInteraction = require('./MessageComponentInteraction');
-const { Events } = require('../util/Constants');
 
 /**
- * Represents any select menu interaction.
+ * Represents a select menu interaction.
  * @extends {MessageComponentInteraction}
  */
 class SelectMenuInteraction extends MessageComponentInteraction {
@@ -20,151 +18,4 @@ class SelectMenuInteraction extends MessageComponentInteraction {
   }
 }
 
-module.exports.SelectMenuInteraction = SelectMenuInteraction;
-
-/**
- * Represents a CHANNEL_SELECT interaction.
- * @extends {SelectMenuInteraction}
- */
-class ChannelSelectInteraction extends SelectMenuInteraction {
-  constructor(client, data) {
-    super(client, data);
-
-    const { channels } = data.data.resolved ?? {};
-
-    /**
-     * Collection of the selected channels
-     * @type {Collection<Snowflake, Channel|APIChannel>}
-     */
-    this.channels = new Collection();
-    for (const channel of Object.values(channels)) {
-      this.channel.set(channel.id, this.client.channels._add(channel));
-    }
-  }
-}
-
-module.exports.ChannelSelectInteraction = ChannelSelectInteraction;
-
-/**
- * Represents a ROLE_SELECT interaction.
- * @extends {SelectMenuInteraction}
- */
-class RoleSelectInteraction extends SelectMenuInteraction {
-  constructor(client, data) {
-    super(client, data);
-
-    const { roles } = data.data.resolved ?? {};
-
-    /**
-     * Collection of the selected roles
-     * @type {Collection<Snowflake, Role|APIRole>}
-     */
-    this.roles = new Collection();
-    for (const role of Object.values(roles)) {
-      this.roles.set(role.id, this.guild?.roles._add(role) ?? role);
-    }
-  }
-}
-
-module.exports.RoleSelectInteraction = RoleSelectInteraction;
-
-/**
- * Represents a USER_SELECT interaction.
- * @extends {SelectMenuInteraction}
- */
-class UserSelectInteraction extends SelectMenuInteraction {
-  constructor(client, data) {
-    super(client, data);
-
-    const { members, users } = data.data.resolved ?? {};
-
-    /**
-     * Collection of the selected users
-     * @type {Collection<Snowflake, User>}
-     */
-    this.users = new Collection();
-    for (const user of Object.values(users)) {
-      this.users.set(user.id, this.client.users._add(user));
-    }
-
-    if (members) {
-      /**
-       * Collection of the selected members
-       * @type {Collection<Snowflake, GuildMember|APIGuildMember>}
-       */
-      this.members = new Collection();
-      for (const [id, member] of Object.entries(members)) {
-        const user = users[id];
-        if (!user) {
-          this.client.emit(Events.DEBUG, `[SelectMenuInteraction] Received a member without a user, skipping ${id}`);
-          continue;
-        }
-        this.members.set(id, this.guild?.members._add({ user, ...member }) ?? { user, ...member });
-      }
-    }
-  }
-}
-
-module.exports.UserSelectInteraction = UserSelectInteraction;
-
-/**
- * Represents a MENTIONABLE_SELECT interaction.
- * @extends {SelectMenuInteraction}
- */
-class MentionableSelectInteraction extends SelectMenuInteraction {
-  constructor(client, data) {
-    super(client, data);
-
-    const { members, users, roles, channels } = data.data.resolved ?? {};
-
-    if (channels) {
-      /**
-       * Collection of the selected channels
-       * @type {Collection<Snowflake, Channel|APIChannel>}
-       */
-      this.channels = new Collection();
-      for (const channel of Object.values(channels)) {
-        this.channels.set(channel.id, this.client?.channels._add(channel) ?? channel);
-      }
-    }
-
-    if (members) {
-      /**
-       * Collection of the selected members
-       * @type {Collection<Snowflake, GuildMember|APIGuildMember>}
-       */
-      this.members = new Collection();
-      for (const [id, member] of Object.entries(members)) {
-        const user = users[id];
-        if (!user) {
-          this.client.emit(Events.DEBUG, `[SelectMenuInteraction] Received a member without a user, skipping ${id}`);
-          continue;
-        }
-        this.members.set(id, this.guild?.members._add({ user, ...member }) ?? { user, ...member });
-      }
-    }
-
-    if (roles) {
-      /**
-       * Collection of the selected roles
-       * @type {Collection<Snowflake, Role|APIRole>}
-       */
-      this.roles = new Collection();
-      for (const role of Object.values(roles)) {
-        this.roles.set(role.id, this.guild?.roles._add(role) ?? role);
-      }
-    }
-
-    if (users) {
-      /**
-       * Collection of the selected users
-       * @type {Collection<Snowflake, User>}
-       */
-      this.users = new Collection();
-      for (const user of Object.values(users)) {
-        this.users.set(user.id, this.client.users._add(user));
-      }
-    }
-  }
-}
-module.exports.MentionableSelectInteraction = MentionableSelectInteraction;
+module.exports = SelectMenuInteraction;