djs-selfbot-v13 3.1.6 → 3.1.7

package/src/structures/VoiceState.js

@@ -86,15 +86,11 @@ class VoiceState extends Base {
 
     // The self_stream is property is omitted if false, check for another property
     // here to avoid incorrectly clearing this when partial data is specified
-    if ('self_stream' in data) {
-      /**
-       * Whether this member is streaming using "Screen Share"
-       * @type {boolean}
-       */
-      this.streaming = data.self_stream ?? false;
-    } else {
-      this.streaming ??= null;
-    }
+    /**
+     * Whether this member is streaming using "Screen Share"
+     * @type {boolean}
+     */
+    this.streaming = data.self_stream ?? false;
 
     if ('channel_id' in data) {
       /**
@@ -148,11 +144,12 @@ class VoiceState extends Base {
 
   /**
    * The channel that the member is connected to
-   * @type {?(VoiceChannel|StageChannel|DMChannel|GroupDMChannel)}
+   * @type {?(VoiceChannel|StageChannel)}
    * @readonly
    */
   get channel() {
-    return (this.guild || this.client).channels.cache.get(this.channelId) ?? null;
+    if (!this.guild?.id) return this.guild.client.channels.cache.get(this.channelId) ?? null;
+    return this.guild.channels.cache.get(this.channelId) ?? null;
   }
 
   /**
@@ -180,6 +177,7 @@ class VoiceState extends Base {
    * @returns {Promise<GuildMember>}
    */
   setMute(mute = true, reason) {
+    if (!this.guild?.id) return null;
     return this.guild.members.edit(this.id, { mute }, reason);
   }
 
@@ -190,6 +188,7 @@ class VoiceState extends Base {
    * @returns {Promise<GuildMember>}
    */
   setDeaf(deaf = true, reason) {
+    if (!this.guild?.id) return null;
     return this.guild.members.edit(this.id, { deaf }, reason);
   }
 
@@ -199,6 +198,7 @@ class VoiceState extends Base {
    * @returns {Promise<GuildMember>}
    */
   disconnect(reason) {
+    if (!this.guild?.id) return this.callVoice?.disconnect();
     return this.setChannel(null, reason);
   }
 
@@ -210,6 +210,7 @@ class VoiceState extends Base {
    * @returns {Promise<GuildMember>}
    */
   setChannel(channel, reason) {
+    if (!this.guild?.id) return null;
     return this.guild.members.edit(this.id, { channel }, reason);
   }
 
@@ -226,16 +227,18 @@ class VoiceState extends Base {
    * @returns {Promise<void>}
    */
   async setRequestToSpeak(request = true) {
-    if (this.channel?.type !== 'GUILD_STAGE_VOICE') throw new Error('VOICE_NOT_STAGE_CHANNEL');
+    if (this.guild?.id) {
+      if (this.channel?.type !== 'GUILD_STAGE_VOICE') throw new Error('VOICE_NOT_STAGE_CHANNEL');
 
-    if (this.client.user.id !== this.id) throw new Error('VOICE_STATE_NOT_OWN');
+      if (this.client.user.id !== this.id) throw new Error('VOICE_STATE_NOT_OWN');
 
-    await this.client.api.guilds(this.guild.id, 'voice-states', '@me').patch({
-      data: {
-        channel_id: this.channelId,
-        request_to_speak_timestamp: request ? new Date().toISOString() : null,
-      },
-    });
+      await this.client.api.guilds(this.guild.id, 'voice-states', '@me').patch({
+        data: {
+          channel_id: this.channelId,
+          request_to_speak_timestamp: request ? new Date().toISOString() : null,
+        },
+      });
+    }
   }
 
   /**
@@ -256,75 +259,37 @@ class VoiceState extends Base {
    * @returns {Promise<void>}
    */
   async setSuppressed(suppressed = true) {
-    if (typeof suppressed !== 'boolean') throw new TypeError('VOICE_STATE_INVALID_TYPE', 'suppressed');
+    if (this.guild?.id) {
+      if (typeof suppressed !== 'boolean') throw new TypeError('VOICE_STATE_INVALID_TYPE', 'suppressed');
 
-    if (this.channel?.type !== 'GUILD_STAGE_VOICE') throw new Error('VOICE_NOT_STAGE_CHANNEL');
+      if (this.channel?.type !== 'GUILD_STAGE_VOICE') throw new Error('VOICE_NOT_STAGE_CHANNEL');
 
-    const target = this.client.user.id === this.id ? '@me' : this.id;
+      const target = this.client.user.id === this.id ? '@me' : this.id;
 
-    await this.client.api.guilds(this.guild.id, 'voice-states', target).patch({
-      data: {
-        channel_id: this.channelId,
-        suppress: suppressed,
-        request_to_speak_timestamp: null,
-      },
-    });
-  }
-
-  /**
-   * Sets the status of the voice channel
-   * @param {string} [status=""] The message to set the channel status to
-   * @example
-   * // Setting the status to something
-   * guild.members.me.voice.setStatus("something")
-   * @example
-   * // Removing the status
-   * guild.members.me.voice.setStatus()
-   * @returns {Promise<void>}
-   */
-  setStatus(status = '') {
-    // PUT https://discord.com/api/v9/channels/:id/voice-status
-    return this.client.api.channels(this.channel.id, 'voice-status').put({
-      data: {
-        status,
-      },
-    });
+      await this.client.api.guilds(this.guild.id, 'voice-states', target).patch({
+        data: {
+          channel_id: this.channelId,
+          suppress: suppressed,
+        },
+      });
+    }
   }
 
   /**
    * Get URL Image of the user's streaming video (NOT STREAMING !!!)
-   * @returns {Promise<string>} URL Image of the user's streaming video
+   * @returns {string} URL Image of the user's streaming video
    */
   async getPreview() {
+    if (!this.guild?.id) return null;
+
     if (!this.streaming) throw new Error('USER_NOT_STREAMING');
     // URL: https://discord.com/api/v9/streams/guild:guildid:voicechannelid:userid/preview
-    // URL: https://discord.com/api/v9/streams/call:channelId:userId/preview
-    const streamKey = this.guild.id
-      ? `guild:${this.guild.id}:${this.channelId}:${this.id}`
-      : `call:${this.channelId}:${this.id}`;
-    const data = await this.client.api.streams[encodeURIComponent(streamKey)].preview.get();
+    const data = await this.client.api.streams[
+      `guild%3A${this.guild.id}%3A${this.channelId}%3A${this.id}`
+    ].preview.get();
     return data.url;
   }
 
-  /**
-   * Post Preview Image to the client user's streaming video
-   * @param {string} base64Image Base64 URI (data:image/jpeg;base64,data)
-   * @returns {Promise<void>}
-   */
-  postPreview(base64Image) {
-    if (!this.client.user.id === this.id || !this.streaming) throw new Error('USER_NOT_STREAMING');
-    // URL: https://discord.com/api/v9/streams/guild:guildid:voicechannelid:userid/preview
-    // URL: https://discord.com/api/v9/streams/call:channelId:userId/preview
-    const streamKey = this.guild.id
-      ? `guild:${this.guild.id}:${this.channelId}:${this.id}`
-      : `call:${this.channelId}:${this.id}`;
-    return this.client.api.streams[encodeURIComponent(streamKey)].preview.post({
-      data: {
-        thumbnail: base64Image,
-      },
-    });
-  }
-
   toJSON() {
     return super.toJSON({
       id: true,

package/src/structures/WebEmbed.js

@@ -1,18 +1,14 @@
 'use strict';
-
 const baseURL = 'https://webembed-sb.onrender.com/embed?';
 const hiddenCharter =
   '||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||';
+const fetch = require('node-fetch');
 const { RangeError } = require('../errors');
 const Util = require('../util/Util');
 
 /**
  * Send Embedlink to Discord
- * <info>Only works with Discord Web and Discord Client (no custom theme installed)</info>
- * - No Timestamp, Footer, Fields, Author iconURL
- * - Video with Embed working
- * - Can only choose between image and thumbnail
- * - Description limit 350 characters
+ * Need to change WebEmbed API server (because heroku is no longer free)
  */
 class WebEmbed {
   /**
@@ -39,7 +35,6 @@ class WebEmbed {
      * @property {Partial<WebEmbedVideo>} [video] The video of this embed
      * @property {Partial<WebEmbedFooter>} [footer] The footer of this embed
      * @property {Partial<WebEmbedProvider>} [provider] The provider of this embed
-     * @property {string} [redirect] Redirect URL
      */
 
     // eslint-disable-next-line valid-jsdoc
@@ -47,6 +42,24 @@ class WebEmbed {
      * @param {WebEmbed|WebEmbedOptions|APIEmbed} [data={}] WebEmbed to clone or raw embed data
      */
     this._setup(data);
+    /**
+     * Shorten the link
+     * @type {?boolean}
+     */
+    this.shorten = data.shorten ?? true;
+
+    /**
+     * Hidden Embed link
+     * @type {?boolean}
+     */
+    this.hidden = data.hidden ?? false;
+
+    /**
+     * Using Custom WebEmbed server ?
+     * @type {?string} https://webembed-sb.onrender.com/embed?
+     * @see https://github.com/aiko-chan-ai/WebEmbed
+     */
+    this.baseURL = data.baseURL ?? baseURL;
   }
   /**
    * @private
@@ -175,12 +188,6 @@ class WebEmbed {
           url: data.provider.name,
         }
       : null;
-
-    /**
-     * Redirect URL
-     * @type {string}
-     */
-    this.redirect = data.redirect;
   }
   /**
    * The options to provide for setting an author for a {@link WebEmbed}.
@@ -313,59 +320,66 @@ class WebEmbed {
   }
 
   /**
-   * Sets the redirect URL of this embed.
-   * @param {string} url The URL
-   * @returns {WebEmbed}
+   * Return Message Content + Embed (if hidden, pls check content length because it has 1000+ length)
+   * @returns {string} Message Content
    */
-  setRedirect(url) {
-    this.redirect = url;
-    return this;
-  }
-
-  toString() {
-    const url = new URL(baseURL);
-    url.searchParams.set('image_type', this.imageType);
+  async toMessage() {
+    const arrayQuery = [`image_type=${this.imageType}`];
     if (this.title) {
-      url.searchParams.set('title', this.title);
+      arrayQuery.push(`title=${encodeURIComponent(this.title)}`);
     }
     if (this.description) {
-      url.searchParams.set('description', this.description);
+      arrayQuery.push(`description=${encodeURIComponent(this.description)}`);
     }
     if (this.url) {
-      url.searchParams.set('url', this.url);
+      arrayQuery.push(`url=${encodeURIComponent(this.url)}`);
     }
     if (this.color) {
-      url.searchParams.set('color', `#${this.color.toString(16)}`);
+      arrayQuery.push(`color=${encodeURIComponent(`#${this.color.toString(16)}`)}`);
     }
     if (this.image?.url) {
-      url.searchParams.set('image', this.image.url);
+      arrayQuery.push(`image=${encodeURIComponent(this.image.url)}`);
     }
     if (this.video?.url) {
-      url.searchParams.set('video', this.video.url);
+      arrayQuery.push(`video=${encodeURIComponent(this.video.url)}`);
     }
     if (this.author) {
       if (this.author.name) {
-        url.searchParams.set('author_name', this.author.name);
+        arrayQuery.push(`author_name=${encodeURIComponent(this.author.name)}`);
       }
       if (this.author.url) {
-        url.searchParams.set('author_url', this.author.url);
+        arrayQuery.push(`author_url=${encodeURIComponent(this.author.url)}`);
       }
     }
     if (this.provider) {
       if (this.provider.name) {
-        url.searchParams.set('provider_name', this.provider.name);
+        arrayQuery.push(`provider_name=${encodeURIComponent(this.provider.name)}`);
       }
       if (this.provider.url) {
-        url.searchParams.set('provider_url', this.provider.url);
+        arrayQuery.push(`provider_url=${encodeURIComponent(this.provider.url)}`);
       }
     }
     if (this.thumbnail?.url) {
-      url.searchParams.set('image', this.thumbnail.url);
+      arrayQuery.push(`image=${encodeURIComponent(this.thumbnail.url)}`);
+    }
+    const fullURL = `${this.baseURL}${arrayQuery.join('&')}`;
+    if (this.shorten) {
+      const url = await this.constructor.getShorten(fullURL);
+      if (!url) console.log('Cannot shorten URL in WebEmbed');
+      return this.hidden ? `${hiddenCharter} ${url || fullURL}` : url || fullURL;
+    } else {
+      return this.hidden ? `${hiddenCharter} ${fullURL}` : fullURL;
     }
-    if (this.redirect) {
-      url.searchParams.set('redirect', this.redirect);
+  }
+
+  static async getShorten(url) {
+    const shorten = `https://tinyurl.com/api-create.php?url=${encodeURIComponent(url)}`;
+    try {
+      const res = await (await fetch(shorten)).text();
+      return res;
+    } catch {
+      return undefined;
     }
-    return url.toString();
   }
 }
 

package/src/structures/Webhook.js

@@ -72,7 +72,7 @@ class Webhook {
 
     if ('channel_id' in data) {
       /**
-       * The id of the channel the webhook belongs to
+       * The channel the webhook belongs to
        * @type {Snowflake}
        */
       this.channelId = data.channel_id;
@@ -116,7 +116,6 @@ class Webhook {
    * @property {string} [avatarURL] Avatar URL override for the message
    * @property {Snowflake} [threadId] The id of the thread in the channel to send to.
    * <info>For interaction webhooks, this property is ignored</info>
-   * @property {string} [threadName] Name of the thread to create (only available if webhook is in a forum channel)
    * @property {MessageFlags} [flags] Which flags to set for the message. Only `SUPPRESS_EMBEDS` can be set.
    */
 
@@ -128,10 +127,11 @@ class Webhook {
    * @property {FileOptions[]|BufferResolvable[]|MessageAttachment[]} [files] See {@link BaseMessageOptions#files}
    * @property {MessageMentionOptions} [allowedMentions] See {@link BaseMessageOptions#allowedMentions}
    * @property {MessageAttachment[]} [attachments] Attachments to send with the message
-   * @property {MessageActionRow[]|MessageActionRowOptions[]} [components]
+   * @property {Array<(MessageActionRow|MessageActionRowOptions)>} [components]
    * Action rows containing interactive components for the message (buttons, select menus)
    * @property {Snowflake} [threadId] The id of the thread this message belongs to
    * <info>For interaction webhooks, this property is ignored</info>
+   * @property {string} [threadName] Name of the thread to create (only available if webhook is in a forum channel)
    */
 
   /**
@@ -188,9 +188,9 @@ class Webhook {
     let messagePayload;
 
     if (options instanceof MessagePayload) {
-      messagePayload = options.resolveData();
+      messagePayload = await options.resolveData();
     } else {
-      messagePayload = MessagePayload.create(this, options).resolveData();
+      messagePayload = await MessagePayload.create(this, options).resolveData();
     }
 
     const { data, files } = await messagePayload.resolveFiles();
@@ -324,10 +324,13 @@ class Webhook {
 
     let messagePayload;
 
-    if (options instanceof MessagePayload) messagePayload = options;
-    else messagePayload = MessagePayload.create(this, options);
+    if (options instanceof MessagePayload) {
+      messagePayload = await options.resolveData();
+    } else {
+      messagePayload = await MessagePayload.create(this, options).resolveData();
+    }
 
-    const { data, files } = await messagePayload.resolveData().resolveFiles();
+    const { data, files } = await messagePayload.resolveFiles();
 
     const d = await this.client.api
       .webhooks(this.id, this.token)
@@ -383,15 +386,6 @@ class Webhook {
       });
   }
 
-  /**
-   * The channel the webhook belongs to
-   * @type {?(TextChannel|VoiceChannel|NewsChannel|ForumChannel)}
-   * @readonly
-   */
-  get channel() {
-    return this.client.channels.resolve(this.channelId);
-  }
-
   /**
    * The timestamp the webhook was created at
    * @type {number}

package/src/structures/interfaces/Application.js

@@ -1,13 +1,10 @@
 'use strict';
 
 const process = require('node:process');
-const { ApplicationFlags } = require('../../util/ApplicationFlags');
 const { ClientApplicationAssetTypes, Endpoints } = require('../../util/Constants');
 const Permissions = require('../../util/Permissions');
 const SnowflakeUtil = require('../../util/SnowflakeUtil');
-const { ApplicationRoleConnectionMetadata } = require('../ApplicationRoleConnectionMetadata');
 const Base = require('../Base');
-const Team = require('../Team');
 
 const AssetTypes = Object.keys(ClientApplicationAssetTypes);
 
@@ -70,132 +67,6 @@ class Application extends Base {
     } else {
       this.roleConnectionsVerificationURL ??= null;
     }
-
-    // ClientApplication
-    /**
-     * The tags this application has (max of 5)
-     * @type {string[]}
-     */
-    this.tags = data.tags ?? [];
-
-    if ('install_params' in data) {
-      /**
-       * Settings for this application's default in-app authorization
-       * @type {?ClientApplicationInstallParams}
-       */
-      this.installParams = {
-        scopes: data.install_params.scopes,
-        permissions: new Permissions(data.install_params.permissions).freeze(),
-      };
-    } else {
-      this.installParams ??= null;
-    }
-
-    if ('custom_install_url' in data) {
-      /**
-       * This application's custom installation URL
-       * @type {?string}
-       */
-      this.customInstallURL = data.custom_install_url;
-    } else {
-      this.customInstallURL = null;
-    }
-
-    if ('flags' in data) {
-      /**
-       * The flags this application has
-       * @type {ApplicationFlags}
-       */
-      this.flags = new ApplicationFlags(data.flags).freeze();
-    }
-
-    if ('approximate_guild_count' in data) {
-      /**
-       * An approximate amount of guilds this application is in.
-       * @type {?number}
-       */
-      this.approximateGuildCount = data.approximate_guild_count;
-    } else {
-      this.approximateGuildCount ??= null;
-    }
-
-    if ('guild_id' in data) {
-      /**
-       * The id of the guild associated with this application.
-       * @type {?Snowflake}
-       */
-      this.guildId = data.guild_id;
-    } else {
-      this.guildId ??= null;
-    }
-
-    if ('cover_image' in data) {
-      /**
-       * The hash of the application's cover image
-       * @type {?string}
-       */
-      this.cover = data.cover_image;
-    } else {
-      this.cover ??= null;
-    }
-
-    if ('rpc_origins' in data) {
-      /**
-       * The application's RPC origins, if enabled
-       * @type {string[]}
-       */
-      this.rpcOrigins = data.rpc_origins;
-    } else {
-      this.rpcOrigins ??= [];
-    }
-
-    if ('bot_require_code_grant' in data) {
-      /**
-       * If this application's bot requires a code grant when using the OAuth2 flow
-       * @type {?boolean}
-       */
-      this.botRequireCodeGrant = data.bot_require_code_grant;
-    } else {
-      this.botRequireCodeGrant ??= null;
-    }
-
-    if ('bot_public' in data) {
-      /**
-       * If this application's bot is public
-       * @type {?boolean}
-       */
-      this.botPublic = data.bot_public;
-    } else {
-      this.botPublic ??= null;
-    }
-
-    /**
-     * The owner of this OAuth application
-     * @type {?(User|Team)}
-     */
-    this.owner = data.team
-      ? new Team(this.client, data.team)
-      : data.owner
-      ? this.client.users._add(data.owner)
-      : this.owner ?? null;
-  }
-
-  /**
-   * The guild associated with this application.
-   * @type {?Guild}
-   * @readonly
-   */
-  get guild() {
-    return this.client.guilds.cache.get(this.guildId) ?? null;
-  }
-
-  /**
-   * Whether this application is partial
-   * @type {boolean}
-   * @readonly
-   */
-  get partial() {
-    return !this.name;
   }
 
   /**
@@ -217,29 +88,35 @@ class Application extends Base {
   }
 
   /**
-   * Obtains this application from Discord.
-   * @returns {Promise<Application>}
+   * Invites this application to a guild / server
+   * @param {Snowflake} guild_id The id of the guild that you want to invite the bot to
+   * @param {PermissionResolvable} [permissions] The permissions for the bot in number form (the default is 8 / Administrator)
+   * @param {string} [captcha] The captcha key to add
+   * @returns {Promise<void>} nothing :)
    */
-  async fetch() {
-    const app = await this.client.api.oauth2.authorize.get({
+  async invite(guild_id, permissions, captcha = null) {
+    permissions = Permissions.resolve(permissions || 0n);
+    const postData = {
+      authorize: true,
+      guild_id,
+      permissions: '0',
+    };
+    if (permissions) {
+      postData.permissions = permissions;
+    }
+    if (captcha && typeof captcha === 'string' && captcha.length > 0) {
+      postData.captcha = captcha;
+    }
+    await this.client.api.oauth2.authorize.post({
       query: {
         client_id: this.id,
         scope: 'bot applications.commands',
       },
+      data: postData,
+      headers: {
+        referer: `https://discord.com/oauth2/authorize?client_id=${this.id}&permissions=${permissions}&scope=bot`,
+      },
     });
-    const user = this.client.users._add(app.bot);
-    user._partial = false;
-    this._patch(app.application);
-    return this;
-  }
-
-  /**
-   * Gets this application's role connection metadata records
-   * @returns {Promise<ApplicationRoleConnectionMetadata[]>}
-   */
-  async fetchRoleConnectionMetadataRecords() {
-    const metadata = await this.client.api.applications(this.id)('role-connections').metadata.get();
-    return metadata.map(data => new ApplicationRoleConnectionMetadata(data));
   }
 
   /**