Minor update

- feat(Client): redeemNitro & autoRedeemNitro - fix(Modal): Reply modal bug - fix(RichPresence): setAssetsImage bug - refactor(RichPresence): Clean code
2022-07-09 19:47:00 +07:00 · 2022-07-09 19:47:00 +07:00 · 536a86a5f3
commit 536a86a5f3
parent 0df013b2dc
14 changed files with 88 additions and 7030 deletions
--- a/.gitignore
+++ b/.gitignore
@ -80,4 +80,6 @@ deploy/deploy_key.pub

 # Custom
 data/
-update.mjs
+update.mjs
+yarn.lock
+package-lock.json
--- a/Document/ClientOption.md
+++ b/Document/ClientOption.md
@ -9,8 +9,8 @@ new Client({
  checkUpdate: true, // Check Package Update (Bot Ready) [Enable Default]
  readyStatus: false, // Set Custom Status sync from Account (Bot Ready) [Disable Default]
  autoCookie: true, //  Auto added Cookie and Fingerprint [Enable Default](https://github.com/aiko-chan-ai/discord.js-selfbot-v13/blob/main/DOCUMENT.md#http-options)
-  autoRedeemNitro: true, // Automaticlly redeems nitro codes <NOTE: there is no cooldown on the auto redeem> [Enable Default]
-})
+  autoRedeemNitro: true, // Automaticlly redeems nitro codes <NOTE: there is no cooldown on the auto redeem> [Disable Default]
+});
 ```

 ## Client Functions
--- a/Document/RichPresence.md
+++ b/Document/RichPresence.md
@ -1,8 +1,6 @@
 ## Custom Status and RPC

-<details open>
-<summary><strong>Click to show</strong></summary>
-Custom Status
+<strong>Custom Status</strong>

 ```js
 const r = new Discord.CustomStatus()
@ -54,27 +52,39 @@ client.user.setActivity(r.toJSON());
 <img src='https://cdn.discordapp.com/attachments/820557032016969751/994512258128420944/unknown.png'>


+<strong>You can now add custom images for RPC !</strong>

-<strong>New: You can now add custom images for RPC !</strong>
 > Tutorial:

-+ Step 1: Send photos by embed.thumbnail
+ Step 1: Send image to Discord

-```js
-const embed = new MessageEmbed().setThumbnail('image url');
-const msg = await channel.send({ embeds: [embed] });
-```
-+ Step 2: Get proxyURL from message.embeds[0].thumbnail.proxyURL
+<img src='https://cdn.discordapp.com/attachments/820557032016969751/995297572732284968/unknown.png'>

-```js
-const proxyURL = msg.embeds[0].thumbnail.proxyURL;
+ Step 2: Get Image URL
+
+<img src='https://cdn.discordapp.com/attachments/820557032016969751/995298082474426418/unknown.png'>
+
+```sh
+Demo URL: https://cdn.discordapp.com/attachments/820557032016969751/991172011483218010/unknown.png
 ```
-+ Step 3: Put the URL in the constructor
+
+ Step 3: Replace `https://cdn.discordapp.com/` or `https://media.discordapp.net/` with `mp:`
+
+```diff
+- https://cdn.discordapp.com/attachments/820557032016969751/991172011483218010/unknown.png
+
+- https://media.discordapp.net/attachments/820557032016969751/991172011483218010/unknown.png
+
+ mp:attachments/820557032016969751/991172011483218010/unknown.png
+
+```
+
+ Step 4:

 ```js
 const r = new Discord.RichPresence()
 	.setApplicationId('817229550684471297')
-	.setType('STREAMING')
+	.setType('PLAYING')
 	.setURL('https://youtube.com/watch?v=dQw4w9WgXcQ')
 	.setState('State')
 	.setName('Name')
@ -85,7 +95,7 @@ const r = new Discord.RichPresence()
 		id: Discord.getUUID(),
 	})
 	.setStartTimestamp(Date.now())
-	.setAssetsLargeImage(proxyURL)
+	.setAssetsLargeImage('mp:attachments/820557032016969751/991172011483218010/unknown.png')
 	.setAssetsLargeText('Youtube')
 	.setAssetsSmallImage('895316294222635008')
 	.setAssetsSmallText('Bot')
@ -93,5 +103,22 @@ const r = new Discord.RichPresence()
 client.user.setActivity(r.toDiscord().game);
 ```

-And you can change the status 5 times every 20 seconds!
-</details>
+<img src='https://cdn.discordapp.com/attachments/820557032016969751/995301015257616414/unknown.png'>
+
+<strong>How to get the Assets ID and Name of the bot (application) ?</strong>
+
+- Bot:
+```js
+const bot = await client.users.fetch('BotId');
+const asset = await bot.application.fetchAssets();
+// asset: Array<ApplicationAsset>
+// Document: https://discordjs-self-v13.netlify.app/#/docs/docs/main/typedef/ApplicationAsset
+```
+<img src='https://cdn.discordapp.com/attachments/820557032016969751/995307830028550204/unknown.png'>
+
+- Application
+> Using Browser (Chrome) with URL: `https://discord.com/api/v9/oauth2/applications/{applicationId}/assets`
+<img src='https://cdn.discordapp.com/attachments/820557032016969751/995307606115618926/unknown.png'>
+
+- More: 
+  - You can change the status 5 times every 20 seconds!
--- a/docs/main.json
+++ b/docs/main.json
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "discord.js-selfbot-v13",
-  "version": "2.3.66",
+  "version": "2.3.67",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "discord.js-selfbot-v13",
-      "version": "2.3.66",
+      "version": "2.3.67",
      "license": "GNU General Public License v3.0",
      "dependencies": {
        "@aikochan2k6/qrcode-terminal": "^0.12.0",
@ -6048,20 +6048,6 @@
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
      "dev": true
    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
    "node_modules/fstream": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
@ -17209,13 +17195,6 @@
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
      "dev": true
    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
    "fstream": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "discord.js-selfbot-v13",
-  "version": "2.3.66",
+  "version": "2.3.67",
  "description": "A unofficial discord.js fork for creating selfbots [Based on discord.js v13]",
  "main": "./src/index.js",
  "types": "./typings/index.d.ts",
--- a/src/client/Client.js
+++ b/src/client/Client.js
@ -151,7 +151,7 @@ class Client extends BaseClient {
    this.guilds = new GuildManager(this);

    /**
-     * All of the Channels that the client is currently handling, mapped by their ids -
+     * All of the {@link Channel}s that the client is currently handling, mapped by their ids -
     * as long as sharding isn't being used, this will be *every* channel in *every* guild the bot
     * is a member of. Note that DM channels will not be initially cached, and thus not be present
     * in the Manager without their explicit fetching or use.
@ -437,49 +437,43 @@ class Client extends BaseClient {
  /**
   * Automatically Redeem Nitro from raw message
   * @param {Message} message Discord Message
-   * @param {Channel} channel Message Channel
   */
-  async autoRedeemNitro(message, channel) {
+  async autoRedeemNitro(message) {
    if (typeof message !== Message) return;
-    await this.redeemNitro(message.content)
+    await this.redeemNitro(message.content, message.channel, false);
  }

  /**
   * Redeem nitro from code or url
-   * @param {string<NitroCode>} nitro Nitro url or code
-   * @param {Channel} channel Channel that the code was sent in
+   * @param {string} nitro Nitro url or code
+   * @param {TextChannelResolvable} channel Channel that the code was sent in
+   * @param {boolean} failIfNotExists Whether to fail if the code doesn't exist
+   * @returns {Promise<boolean>}
   */
-  async redeemNitro(nitro, channel) {
+  redeemNitro(nitro, channel, failIfNotExists = true) {
    if (typeof nitro !== 'string') throw new Error('INVALID_NITRO');
+    channel = this.channels.resolveId(channel);
    const regex = {
      gift: /(discord.gift|discord.com|discordapp.com\/gifts)\/\w{16,25}/gim,
      url: /(discord\.gift\/|discord\.com\/gifts\/|discordapp\.com\/gifts\/)/gim,
    };
-    if (nitro.match(regex.gift) !== null) {
-      let codes = nitro.match(regex.gift);
-      for (let code of codes) {
-        code = code.replace(regex.url, '');
-        if (this.usedCodes.indexOf(code) > -1) return;
-
-        await this.api.entitlements['gift-codes'](code).redeem.post({
+    const code = DataResolver.resolveCode(nitro, regex.gift);
+    if (this.usedCodes.indexOf(code) > -1) return false;
+    return new Promise((resolve, reject) => {
+      this.api.entitlements['gift-codes'](code)
+        .redeem.post({
          auth: true,
-          data: { channel_id: channel ? channel.id : null, payment_source_id: null },
+          data: { channel_id: channel || null, payment_source_id: null },
+        })
+        .then(() => {
+          this.usedCodes.push(code);
+          resolve(true);
+        })
+        .catch(e => {
+          if (failIfNotExists) reject(e);
+          else resolve(false);
        });
-
-        this.usedCodes.push(code);
-      }
-    } else if ([16, 25].includes(nitro.length)) {
-      if (this.usedCodes.indexOf(nitro) > -1) return;
-
-      await this.api.entitlements['gift-codes'](nitro).redeem.post({
-        auth: true,
-        data: { channel_id: channel ? channel.id : null, payment_source_id: null },
-      });
-
-      this.usedCodes.push(nitro);
-    } else {
-      throw new Error('INVALID_NITRO');
-    }
+    });
  }

  /**
--- a/src/rest/RequestHandler.js
+++ b/src/rest/RequestHandler.js
@ -346,11 +346,6 @@ class RequestHandler {
      } catch (err) {
        throw new HTTPError(err.message, err.constructor.name, err.status, request);
      }
-      /**
-       * If the response code is 10038 or UNKNOWN_GIFT_CODE then return the data object instead of throwing the error. *continues on next line*
-       * [].includes() adds better scaleability instead of stacking if statements (Yellowy)
-       */
-      if ([10038].includes(data.code)) return data;
      throw new DiscordAPIError(data, res.status, request);
    }

--- a/src/structures/RichPresence.js
+++ b/src/structures/RichPresence.js
@ -163,15 +163,6 @@ class RichPresence {
   * @returns {RichPresence}
   */
  setAssetsLargeImage(image) {
-    // Gif support
-    if (
-      typeof image == 'string' &&
-      (image.startsWith('https://') || image.startsWith('http://')) &&
-      image.includes('external') &&
-      image.includes('discord')
-    ) {
-      image = `mp:external${image.split('external')[1]}`;
-    }
    if (!(this.assets instanceof Object)) this.assets = {};
    this.assets.large_image = image;
    return this;
@ -182,15 +173,6 @@ class RichPresence {
   * @returns {RichPresence}
   */
  setAssetsSmallImage(image) {
-    // Gif support
-    if (
-      typeof image == 'string' &&
-      (image.startsWith('https://') || image.startsWith('http://')) &&
-      image.includes('external') &&
-      image.includes('discord')
-    ) {
-      image = `mp:external${image.split('external')[1]}`;
-    }
    if (!(this.assets instanceof Object)) this.assets = {};
    this.assets.small_image = image;
    return this;
@ -458,13 +440,7 @@ class SpotifyRPC extends RichPresence {
   */
  setAssetsLargeImage(image) {
    if (image.startsWith('spotify:')) image = image.replace('spotify:', '');
-    if (!(this.assets instanceof Object)) {
-      this.assets = {
-        large_image: `spotify:${image}`,
-      };
-    } else {
-      this.assets.large_image = `spotify:${image}`;
-    }
+    super.setAssetsLargeImage(`spotify:${image}`);
    return this;
  }
  /**
@ -474,13 +450,7 @@ class SpotifyRPC extends RichPresence {
   */
  setAssetsSmallImage(image) {
    if (image.startsWith('spotify:')) image = image.replace('spotify:', '');
-    if (!(this.assets instanceof Object)) {
-      this.assets = {
-        small_image: `spotify:${image}`,
-      };
-    } else {
-      this.assets.small_image = `spotify:${image}`;
-    }
+    super.setAssetsSmallImage(`spotify:${image}`);
    return this;
  }
  /**
--- a/src/structures/User.js
+++ b/src/structures/User.js
@ -472,8 +472,8 @@ class User extends Base {

  /**
   * Set note to user
-   * @param {string<User.note>} note Note to set
-   * @returns {Promise<User.note>}
+   * @param {string} note Note to set
+   * @returns {Promise<User>}
   */
  async setNote(note = null) {
    await this.client.api.users['@me'].notes(this.id).put({ data: { note } });
--- a/src/util/Constants.js
+++ b/src/util/Constants.js
@ -1036,6 +1036,7 @@ exports.VerificationLevels = createEnum(['NONE', 'LOW', 'MEDIUM', 'HIGH', 'VERY_
 * * INVALID_API_VERSION
 * * FILE_UPLOADED_EXCEEDS_MAXIMUM_SIZE
 * * INVALID_FILE_UPLOADED
+ * * GIFT_CODE_CLAIMED
 * * CANNOT_SELF_REDEEM_GIFT
 * * INVALID_GUILD
 * * PAYMENT_SOURCE_REQUIRED
@ -1184,6 +1185,7 @@ exports.APIErrors = {
  INVALID_API_VERSION: 50041,
  FILE_UPLOADED_EXCEEDS_MAXIMUM_SIZE: 50045,
  INVALID_FILE_UPLOADED: 50046,
+  GIFT_CODE_CLAIMED: 50050,
  CANNOT_SELF_REDEEM_GIFT: 50054,
  INVALID_GUILD: 50055,
  PAYMENT_SOURCE_REQUIRED: 50070,
--- a/src/util/Options.js
+++ b/src/util/Options.js
@ -40,6 +40,7 @@ const JSONBig = require('json-bigint');
 * @property {boolean} [readyStatus=true] Sync state with Discord Client
 * @property {boolean} [autoCookie=true] Automatically add Cookies to Request on startup
 * @property {boolean} [patchVoice=true] Automatically patch @discordjs/voice module (support for call)
+ * @property {boolean} [autoRedeemNitro=false] Automaticlly redeems nitro codes <NOTE: there is no cooldown on the auto redeem>
 * @property {number} [shardCount=1] The total amount of shards used by all processes of this bot
 * (e.g. recommended shard count, shard count of the ShardingManager)
 * @property {CacheFactory} [makeCache] Function to create a cache.
@ -144,7 +145,7 @@ class Options extends null {
      checkUpdate: true,
      readyStatus: true,
      autoCookie: true,
-      autoRedeemNitro: true,
+      autoRedeemNitro: false,
      patchVoice: true,
      waitGuildTimeout: 15_000,
      shardCount: 1,
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@ -689,7 +689,7 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
  private presence: ClientPresence;
  private _eval(script: string): unknown;
  private _validateOptions(options: ClientOptions): void;
-  private autoRedeemNitro(message: Message, channel: Channel): object;
+  private autoRedeemNitro(message: Message): object;

  public application: If<Ready, ClientApplication>;
  // Added
@ -722,7 +722,7 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
  public fetchPremiumStickerPacks(): Promise<Collection<Snowflake, StickerPack>>;
  public fetchWebhook(id: Snowflake, token?: string): Promise<Webhook>;
  public fetchGuildWidget(guild: GuildResolvable): Promise<Widget>;
-  public redeemNitro(code: string, channel?: Channel): object;
+  public redeemNitro(code: string, channel?: TextChannelResolvable, failIfNotExists?: boolean): object;
  public generateInvite(options?: InviteGenerationOptions): string;
  public login(token?: string): Promise<string>;
  public QRLogin(debug?: boolean): DiscordAuthWebsocket;
@ -4050,6 +4050,7 @@ export interface APIErrors {
  INVALID_API_VERSION: 50041;
  FILE_UPLOADED_EXCEEDS_MAXIMUM_SIZE: 50045;
  INVALID_FILE_UPLOADED: 50046;
+  GIFT_CODE_CLAIMED: 50050;
  CANNOT_SELF_REDEEM_GIFT: 50054;
  INVALID_GUILD: 50055;
  PAYMENT_SOURCE_REQUIRED: 50070;
--- a/yarn.lock
+++ b/yarn.lock