djs-selfbot-v13 3.1.8 → 3.2.2

package/src/structures/User.js

@@ -151,6 +151,30 @@ class User extends Base {
       this.avatarDecoration ??= null;
       this.avatarDecorationSKUId ??= null;
     }
+
+    if ('clan' in data && data.clan) {
+      /**
+       * User Clan Structure
+       * @see {@link https://docs.discord.sex/resources/user#user-clan-structure}
+       * @typedef {Object} UserClan
+       * @property {?Snowflake} identityGuildId The ID of the user's primary clan
+       * @property {boolean} identityEnabled Whether the user is displaying their clan tag
+       * @property {?string} tag The text of the user's clan tag (max 4 characters)
+       * @property {?string} badge The clan's badge hash
+       */
+      /**
+       * The primary clan the user is in
+       * @type {?UserClan}
+       */
+      this.clan = {
+        identityGuildId: data.clan.identity_guild_id,
+        identityEnabled: data.clan.identity_enabled,
+        tag: data.clan.tag,
+        badge: data.clan.badge,
+      };
+    } else {
+      this.clan ??= null;
+    }
   }
 
   /**
@@ -200,6 +224,15 @@ class User extends Base {
     return this.client.rest.cdn.AvatarDecoration(this.id, this.avatarDecoration, format, size);
   }
 
+  /**
+   * A link to the user's clan badge.
+   * @returns {?string}
+   */
+  clanBadgeURL() {
+    if (!this.clan || !this.clan.identityGuildId || !this.clan.badge) return null;
+    return this.client.rest.cdn.ClanBadge(this.clan.identityGuildId, this.clan.badge);
+  }
+
   /**
    * A link to the user's default avatar
    * @type {string}
@@ -369,6 +402,7 @@ class User extends Base {
     return this.client.api.users(this.id).profile.get({
       query: {
         with_mutual_guilds: true,
+        with_mutual_friends: true,
         with_mutual_friends_count: true,
         guild_id: guildId,
       },
@@ -467,7 +501,7 @@ class User extends Base {
 
   /**
    * Check relationship status (Client -> User)
-   * @type {RelationshipTypes}
+   * @type {RelationshipType}
    * @readonly
    */
   get relationship() {

package/src/structures/interfaces/TextBasedChannel.js

@@ -75,6 +75,7 @@ class TextBasedChannel {
    * @property {Array<(MessageActionRow|MessageActionRowOptions)>} [components]
    * Action rows containing interactive components for the message (buttons, select menus)
    * @property {MessageAttachment[]} [attachments] Attachments to send in the message
+   * @property {MessagePoll} [poll] A poll!
    */
 
   /**
@@ -186,7 +187,7 @@ class TextBasedChannel {
     return this.messages.cache.get(d.id) ?? this.messages._add(d);
   }
 
-  searchInteraction() {
+  searchInteractionFromGuildAndPrivateChannel() {
     // Support Slash / ContextMenu
     // API https://canary.discord.com/api/v9/guilds/:id/application-command-index // Guild
     //     https://canary.discord.com/api/v9/channels/:id/application-command-index // DM Channel
@@ -196,6 +197,19 @@ class TextBasedChannel {
     ].get();
   }
 
+  searchInteractionUserApps() {
+    return this.client.api.users['@me']['application-command-index'].get();
+  }
+
+  searchInteraction() {
+    return Promise.all([this.searchInteractionFromGuildAndPrivateChannel(), this.searchInteractionUserApps()]).then(
+      ([dataA, dataB]) => ({
+        applications: [...dataA.applications, ...dataB.applications],
+        application_commands: [...dataA.application_commands, ...dataB.application_commands],
+      }),
+    );
+  }
+
   async sendSlash(botOrApplicationId, commandNameString, ...args) {
     // Parse commandName /role add user
     const cmd = commandNameString.trim().split(' ');
@@ -225,7 +239,9 @@ class TextBasedChannel {
     );
     // Find Command with application
     const command = filterCommand.find(command => command.application_id == application.id);
-
+    if (!command) {
+      throw new Error('INVALID_APPLICATION_COMMAND', application.id);
+    }
     args = args.flat(2);
     let optionFormat = [];
     let attachments = [];
@@ -326,27 +342,7 @@ class TextBasedChannel {
       data: body,
       usePayloadJSON: true,
     });
-    return new Promise((resolve, reject) => {
-      const timeoutMs = 5_000;
-      // Waiting for MsgCreate / ModalCreate
-      const handler = data => {
-        if (data.nonce !== nonce) return;
-        clearTimeout(timeout);
-        this.client.removeListener(Events.MESSAGE_CREATE, handler);
-        this.client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
-        this.client.decrementMaxListeners();
-        resolve(data);
-      };
-      const timeout = setTimeout(() => {
-        this.client.removeListener(Events.MESSAGE_CREATE, handler);
-        this.client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
-        this.client.decrementMaxListeners();
-        reject(new Error('INTERACTION_FAILED'));
-      }, timeoutMs).unref();
-      this.client.incrementMaxListeners();
-      this.client.on(Events.MESSAGE_CREATE, handler);
-      this.client.on(Events.INTERACTION_MODAL_CREATE, handler);
-    });
+    return Util.createPromiseInteraction(this.client, nonce, 5000);
   }
 
   /**
@@ -471,6 +467,8 @@ class TextBasedChannel {
       props.push(
         'sendSlash',
         'searchInteraction',
+        'searchInteractionFromGuildAndPrivateChannel',
+        'searchInteractionUserApps',
         'lastMessage',
         'lastPinAt',
         'sendTyping',

package/src/util/Constants.js

@@ -9,7 +9,7 @@ const { Error, RangeError, TypeError } = require('../errors');
 exports.MaxBulkDeletableMessageAge = 1_209_600_000;
 
 exports.UserAgent =
-  'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Electron/22.3.26 Safari/537.36';
+  'Mozilla/5.0 (Windows NT 10.0; WOW64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Safari/537.36';
 
 /**
  * Google Chrome v108 TLS ciphers
@@ -98,6 +98,7 @@ exports.Endpoints = {
       },
       AvatarDecoration: (userId, hash, format = 'png', size) =>
         makeImageUrl(`${root}/avatar-decorations/${userId}/${hash}`, { format, size }),
+      ClanBadge: (guildId, hash) => `${root}/clan-badges/${guildId}/${hash}.png`,
       GuildMemberAvatar: (guildId, memberId, hash, format = 'webp', size, dynamic = false) => {
         if (dynamic && hash.startsWith('a_')) format = 'gif';
         return makeImageUrl(`${root}/guilds/${guildId}/users/${memberId}/avatars/${hash}`, { format, size });
@@ -430,6 +431,8 @@ exports.Events = {
   CALL_CREATE: 'callCreate',
   CALL_UPDATE: 'callUpdate',
   CALL_DELETE: 'callDelete',
+  MESSAGE_POLL_VOTE_ADD: 'messagePollVoteAdd',
+  MESSAGE_POLL_VOTE_REMOVE: 'messagePollVoteRemove',
 };
 
 /**
@@ -755,10 +758,11 @@ exports.SystemMessageTypes = exports.MessageTypes.filter(
  * * WATCHING
  * * CUSTOM
  * * COMPETING
+ * * HANG
  * @typedef {string} ActivityType
  * @see {@link https://discord.com/developers/docs/game-sdk/activities#data-models-activitytype-enum}
  */
-exports.ActivityTypes = createEnum(['PLAYING', 'STREAMING', 'LISTENING', 'WATCHING', 'CUSTOM', 'COMPETING']);
+exports.ActivityTypes = createEnum(['PLAYING', 'STREAMING', 'LISTENING', 'WATCHING', 'CUSTOM', 'COMPETING', 'HANG']);
 
 /**
  * All available channel types:
@@ -1648,6 +1652,15 @@ exports.SortOrderTypes = createEnum([null, 'LATEST_ACTIVITY', 'CREATION_DATE']);
  */
 exports.ForumLayoutTypes = createEnum(['NOT_SET', 'LIST_VIEW', 'GALLERY_VIEW']);
 
+/**
+ * Different layouts for {@link MessagePoll} will come in the future. For now though, this value will always be `DEFAULT`.
+ * * DEFAULT
+ * * IMAGE_ONLY_ANSWERS
+ * @typedef {string} MessagePollLayoutType
+ * @see {@link https://docs.discord.sex/resources/message#poll-layout-type}
+ */
+exports.MessagePollLayoutTypes = createEnum([null, 'DEFAULT', 'IMAGE_ONLY_ANSWERS']);
+
 /**
  * Relationship Enums:
  * * 0: NONE
@@ -1656,7 +1669,7 @@ exports.ForumLayoutTypes = createEnum(['NOT_SET', 'LIST_VIEW', 'GALLERY_VIEW']);
  * * 3: PENDING_INCOMING
  * * 4: PENDING_OUTGOING
  * * 5: IMPLICIT
- * @typedef {string} RelationshipTypes
+ * @typedef {string} RelationshipType
  * @see {@link https://luna.gitlab.io/discord-unofficial-docs/relationships.html}
  */
 
@@ -1727,7 +1740,7 @@ function createEnum(keys) {
  * @property {Object<InteractionResponseType, number>} InteractionResponseTypes The type of an interaction response.
  * @property {Object<InteractionType, number>} InteractionTypes The type of an {@link Interaction} object.
  * @property {InviteScope[]} InviteScopes The scopes of an invite.
- * @property {Object<RelationshipTypes, number>} RelationshipTypes Relationship Enums
+ * @property {Object<RelationshipType, number>} RelationshipTypes Relationship Enums
  * @property {Object<MembershipState, number>} MembershipStates The value set for a team members membership state.
  * @property {Object<MessageButtonStyle, number>} MessageButtonStyles The style of a message button.
  * @property {Object<MessageComponentType, number>} MessageComponentTypes The type of a message component.

package/src/util/Options.js

@@ -188,18 +188,12 @@ class Options extends null {
           referrer_current: '',
           referring_domain_current: '',
           release_channel: 'stable',
-          client_build_number: 261141,
+          client_build_number: 306208,
           client_event_source: null,
         },
         compress: false,
         client_state: {
           guild_versions: {},
-          highest_last_message_id: '0',
-          read_state_version: 0,
-          user_guild_settings_version: -1,
-          user_settings_version: -1,
-          private_channels_version: '0',
-          api_code_version: 0,
         },
         version: 9,
         agent: {},

package/src/util/Permissions.js

@@ -110,9 +110,14 @@ class Permissions extends BitField {
  * * `MODERATE_MEMBERS`
  * * `VIEW_CREATOR_MONETIZATION_ANALYTICS`
  * * `USE_SOUNDBOARD`
+ * * `CREATE_GUILD_EXPRESSIONS`
+ * * `CREATE_EVENTS`
+ * * `USE_EXTERNAL_SOUNDS`
  * * `SEND_VOICE_MESSAGES`
  * * `USE_CLYDE_AI`
  * * `SET_VOICE_CHANNEL_STATUS`
+ * * `SEND_POLLS`
+ * * `USE_EXTERNAL_APPS`
  * @type {Object<string, bigint>}
  * @see {@link https://discord.com/developers/docs/topics/permissions#permissions-bitwise-permission-flags}
  */
@@ -163,9 +168,14 @@ Permissions.FLAGS = {
   MODERATE_MEMBERS: 1n << 40n,
   VIEW_CREATOR_MONETIZATION_ANALYTICS: 1n << 41n,
   USE_SOUNDBOARD: 1n << 42n,
+  CREATE_GUILD_EXPRESSIONS: 1n << 43n,
+  CREATE_EVENTS: 1n << 44n,
+  USE_EXTERNAL_SOUNDS: 1n << 45n,
   SEND_VOICE_MESSAGES: 1n << 46n,
   USE_CLYDE_AI: 1n << 47n,
   SET_VOICE_CHANNEL_STATUS: 1n << 48n,
+  SEND_POLLS: 1n << 49n,
+  USE_EXTERNAL_APPS: 1n << 50n,
 };
 
 /**

package/src/util/Util.js

@@ -1,10 +1,12 @@
 'use strict';
 
+const { Agent } = require('node:http');
 const { parse } = require('node:path');
 const process = require('node:process');
+const { setTimeout } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const fetch = require('node-fetch');
-const { Colors } = require('./Constants');
+const { Colors, Events } = require('./Constants');
 const { Error: DiscordError, RangeError, TypeError } = require('../errors');
 const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k);
 const isObject = d => typeof d === 'object' && d !== null;
@@ -604,7 +606,7 @@ class Util extends null {
           return user ? Util._removeMentions(`@${user.username}`) : input;
         }
 
-        const member = channel.guild.members.cache.get(id);
+        const member = channel.guild?.members.cache.get(id);
         if (member) {
           return Util._removeMentions(`@${member.displayName}`);
         } else {
@@ -795,6 +797,90 @@ class Util extends null {
         .catch(reject);
     });
   }
+
+  /**
+   * Lazily evaluates a callback function (yea it's v14 :yay:)
+   * @param {Function} cb The callback to lazily evaluate
+   * @returns {Function}
+   * @example
+   * const User = lazy(() => require('./User'));
+   * const user = new (User())(client, data);
+   */
+  static lazy(cb) {
+    let defaultValue;
+    return () => (defaultValue ??= cb());
+  }
+
+  /**
+   * Hacking check object instanceof Proxy-agent
+   * @param {Object} object any
+   * @returns {boolean}
+   */
+  static verifyProxyAgent(object) {
+    return typeof object == 'object' && object.httpAgent instanceof Agent && object.httpsAgent instanceof Agent;
+  }
+
+  static createPromiseInteraction(client, nonce, timeoutMs = 5_000, isHandlerDeferUpdate = false, parent) {
+    return new Promise((resolve, reject) => {
+      // Waiting for MsgCreate / ModalCreate
+      let dataFromInteractionSuccess;
+      let dataFromNormal;
+      const handler = data => {
+        // UnhandledPacket
+        if (isHandlerDeferUpdate && data.d?.nonce == nonce && data.t == 'INTERACTION_SUCCESS') {
+          // Interaction#deferUpdate
+          client.removeListener(Events.MESSAGE_CREATE, handler);
+          client.removeListener(Events.UNHANDLED_PACKET, handler);
+          client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
+          dataFromInteractionSuccess = parent;
+        }
+        if (data.nonce !== nonce) return;
+        clearTimeout(timeout);
+        client.removeListener(Events.MESSAGE_CREATE, handler);
+        client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
+        if (isHandlerDeferUpdate) client.removeListener(Events.UNHANDLED_PACKET, handler);
+        client.decrementMaxListeners();
+        dataFromNormal = data;
+        resolve(data);
+      };
+      const timeout = setTimeout(() => {
+        if (dataFromInteractionSuccess || dataFromNormal) {
+          resolve(dataFromNormal || dataFromInteractionSuccess);
+          return;
+        }
+        client.removeListener(Events.MESSAGE_CREATE, handler);
+        client.removeListener(Events.INTERACTION_MODAL_CREATE, handler);
+        if (isHandlerDeferUpdate) client.removeListener(Events.UNHANDLED_PACKET, handler);
+        client.decrementMaxListeners();
+        reject(new Error('INTERACTION_FAILED'));
+      }, timeoutMs).unref();
+      client.incrementMaxListeners();
+      client.on(Events.MESSAGE_CREATE, handler);
+      client.on(Events.INTERACTION_MODAL_CREATE, handler);
+      if (isHandlerDeferUpdate) client.on(Events.UNHANDLED_PACKET, handler);
+    });
+  }
+
+  static clearNullOrUndefinedObject(object) {
+    const data = {};
+    const keys = Object.keys(object);
+
+    for (const key of keys) {
+      const value = object[key];
+      if (value === undefined || value === null || (Array.isArray(value) && value.length === 0)) {
+        continue;
+      } else if (!Array.isArray(value) && typeof value === 'object') {
+        const cleanedValue = Util.clearNullOrUndefinedObject(value);
+        if (cleanedValue !== undefined) {
+          data[key] = cleanedValue;
+        }
+      } else {
+        data[key] = value;
+      }
+    }
+
+    return Object.keys(data).length > 0 ? data : undefined;
+  }
 }
 
 module.exports = Util;

package/typings/enums.d.ts

@@ -8,6 +8,7 @@ export const enum ActivityTypes {
   WATCHING = 3,
   CUSTOM = 4,
   COMPETING = 5,
+  HANG = 6,
 }
 
 export const enum ApplicationCommandTypes {
@@ -86,6 +87,11 @@ export const enum ForumLayoutType {
   GALLERY_VIEW = 2,
 }
 
+export const enum MessagePollLayoutType {
+  DEFAULT = 1,
+  IMAGE_ONLY_ANSWERS,
+}
+
 export const enum MessageTypes {
   DEFAULT,
   RECIPIENT_ADD,
@@ -281,7 +287,7 @@ export enum ApplicationRoleConnectionMetadataTypes {
   BOOLEAN_NOT_EQUAL,
 }
 
-export const enum RelationshipTypes {
+export const enum RelationshipType {
   NONE = 0,
   FRIEND = 1,
   BLOCKED = 2,