Issue #1126 fix data initialization error

feat: add email and password login to client

examples/SlashCommand.md

@@ -89,3 +89,31 @@ await message.channel.sendSlash('718642000898818048', 'sauce', a)
 	}
 
 ```
+
+### Receive messages after bot has replied `{botname} is thinking...`
+
+> [aiko-chan-ai/discord.js-selfbot-v13#1055 (comment)](https://github.com/aiko-chan-ai/discord.js-selfbot-v13/issues/1055#issuecomment-1949653100)
+
+![image](https://cdn.discordapp.com/attachments/820557032016969751/1208363574477590538/image.png?ex=65e30346&is=65d08e46&hm=72771d6aa0d23f817f5daf8d2f33906ff74200aace7787c3cd02d2e30e58f8d5&)
+
+```js
+const channel = client.channels.cache.get('id');
+channel
+	.sendSlash('289066747443675143', 'osu', 'Accolibed')
+	.then(async (message) => {
+		if (message.flags.has('LOADING')) { // owo is thinking...
+			return new Promise((r, rej) => {
+				let t = setTimeout(() => rej('timeout'), 15 * 60 * 1000); // 15m (DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE)
+				message.client.on('messageUpdate', (_, m) => {
+					if (_.id == message.id) {
+						clearTimeout(t);
+						r(m);
+					}
+				});
+			});
+		} else {
+			return Promise.resolve(message);
+		}
+	})
+	.then(console.log);
+```

src/client/Client.js

@@ -277,6 +277,39 @@ class Client extends BaseClient {
     return ws.connect(this);
   }
 
+  /**
+   * Logs the client in, establishing a WebSocket connection to Discord.
+   * @param {string} email The email associated with the account
+   * @param {string} password The password assicated with the account
+   * @param {string | number} [code = null] The mfa code if you have it enabled
+   * @returns {string | null} Token of the account used
+   *
+   * @example
+   * client.passLogin("test@gmail.com", "SuperSecretPa$$word", 1234)
+   */
+  async passLogin(email, password, code = null) {
+    const initial = await this.api.auth.login.post({
+      auth: false,
+      versioned: true,
+      data: { gift_code_sku_id: null, login_source: null, undelete: false, login: email, password },
+    });
+
+    if ('token' in initial) {
+      return this.login(initial.token);
+    } else if ('ticket' in initial) {
+      const totp = await this.api.auth.mfa.totp.post({
+        auth: false,
+        versioned: true,
+        data: { gift_code_sku_id: null, login_source: null, code, ticket: initial.ticket },
+      });
+      if ('token' in totp) {
+        return this.login(totp.token);
+      }
+    }
+
+    return null;
+  }
+
   /**
    * Returns whether the client has logged in, indicative of being able to access
    * properties such as `user` and `application`.

src/client/websocket/WebSocketShard.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const EventEmitter = require('node:events');
-const http = require('node:http');
 const { setTimeout, setInterval, clearTimeout } = require('node:timers');
 const WebSocket = require('../../WebSocket');
 const { Status, Events, ShardEvents, Opcodes, WSEvents, WSCodes } = require('../../util/Constants');
 const Intents = require('../../util/Intents');
+const Util = require('../../util/Util');
 
 const STATUS_KEYS = Object.keys(Status);
 const CONNECTION_STATE = Object.keys(WebSocket.WebSocket);
@@ -272,7 +272,7 @@ class WebSocketShard extends EventEmitter {
     Version    : ${client.options.ws.version}
     Encoding   : ${WebSocket.encoding}
     Compression: ${zlib ? 'zlib-stream' : 'none'}
-    Agent      : ${client.options.ws.agent instanceof http.Agent}`,
+    Agent      : ${Util.verifyProxyAgent(client.options.ws.agent)}`,
       );
 
       this.status = this.status === Status.DISCONNECTED ? Status.RECONNECTING : Status.CONNECTING;
@@ -283,7 +283,7 @@ class WebSocketShard extends EventEmitter {
       // Adding a handshake timeout to just make sure no zombie connection appears.
       const ws = (this.connection = WebSocket.create(gateway, wsQuery, {
         handshakeTimeout: 30_000,
-        agent: client.options.ws.agent instanceof http.Agent ? client.options.ws.agent : undefined,
+        agent: Util.verifyProxyAgent(client.options.ws.agent) ? client.options.ws.agent : undefined,
       }));
       ws.onopen = this.onOpen.bind(this);
       ws.onmessage = this.onMessage.bind(this);

src/managers/GuildForumThreadManager.js

@@ -85,23 +85,23 @@ class GuildForumThreadManager extends ThreadManager {
     });
     const attachmentsData = await Promise.all(requestPromises);
     attachmentsData.sort((a, b) => parseInt(a.id) - parseInt(b.id));
-    data.attachments = attachmentsData;
 
     if (autoArchiveDuration === 'MAX') autoArchiveDuration = resolveAutoArchiveMaxLimit(this.channel.guild);
 
-    const data = await this.client.api.channels(this.channel.id).threads.post({
+    const post_data = await this.client.api.channels(this.channel.id).threads.post({
       data: {
         name,
         auto_archive_duration: autoArchiveDuration,
         rate_limit_per_user: rateLimitPerUser,
         applied_tags: appliedTags,
         message: body,
+        attachments: attachmentsData,
       },
       files: [],
       reason,
     });
 
-    return this.client.actions.ThreadCreate.handle(data).thread;
+    return this.client.actions.ThreadCreate.handle(post_data).thread;
   }
 }
 

src/rest/APIRequest.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const Buffer = require('node:buffer').Buffer;
-const http = require('node:http');
 const https = require('node:https');
 const { setTimeout } = require('node:timers');
 const makeFetchCookie = require('fetch-cookie');
@@ -9,6 +8,7 @@ const FormData = require('form-data');
 const fetchOriginal = require('node-fetch');
 const { CookieJar } = require('tough-cookie');
 const { ciphers } = require('../util/Constants');
+const Util = require('../util/Util');
 
 const cookieJar = new CookieJar();
 const fetch = makeFetchCookie(fetchOriginal, cookieJar);
@@ -40,11 +40,17 @@ class APIRequest {
 
   make(captchaKey, captchaRqToken) {
     if (!agent) {
-      if (this.client.options.http.agent instanceof http.Agent) {
+      if (Util.verifyProxyAgent(this.client.options.http.agent)) {
-        this.client.options.http.agent.options.keepAlive = true;
+        // Bad code
-        this.client.options.http.agent.options.honorCipherOrder = true;
+        for (const [k, v] of Object.entries({
-        this.client.options.http.agent.options.minVersion = 'TLSv1.2';
+          keepAlive: true,
-        this.client.options.http.agent.options.ciphers = ciphers.join(':');
+          honorCipherOrder: true,
+          minVersion: 'TLSv1.2',
+          ciphers: ciphers.join(':'),
+        })) {
+          this.client.options.http.agent.options[k] = v;
+          this.client.options.http.agent.httpsAgent.options.options[k] = v;
+        }
         agent = this.client.options.http.agent;
       } else {
         agent = new https.Agent({

src/structures/ClientPresence.js

@@ -45,7 +45,7 @@ class ClientPresence extends Presence {
     const data = {
       activities: [],
       afk: typeof afk === 'boolean' ? afk : false,
-      since: typeof since === 'number' && !Number.isNaN(since) ? since : null,
+      since: typeof since === 'number' && !Number.isNaN(since) ? since : 0,
       status: status ?? this.status,
     };
     if (activities?.length) {

src/structures/Message.js

@@ -1076,10 +1076,10 @@ class Message extends Base {
    * @returns {Promise<Message|Modal>}
    */
   selectMenu(menu, values = []) {
-    let selectMenu;
+    let selectMenu = menu;
     if (/[0-4]/.test(menu)) {
       selectMenu = this.components[menu]?.components[0];
-    } else {
+    } else if (typeof menu == 'string') {
       selectMenu = this.components
         .flatMap(row => row.components)
         .find(
@@ -1092,7 +1092,7 @@ class Message extends Base {
     if (values.length < selectMenu.minValues) {
       throw new RangeError(`[SELECT_MENU_MIN_VALUES] The minimum number of values is ${selectMenu.minValues}`);
     }
-    if (values.length > selectMenu.maxValues) {
+    if (values.length > selectMenu?.maxValues) {
       throw new RangeError(`[SELECT_MENU_MAX_VALUES] The maximum number of values is ${selectMenu.maxValues}`);
     }
     values = values.map(value => {

src/structures/Presence.js

@@ -404,7 +404,10 @@ class Activity {
   }
 
   toJSON(...props) {
-    return Util.flatten(this, ...props);
+    return {
+      ...Util.flatten(this, ...props),
+      type: typeof this.type === 'number' ? this.type : ActivityTypes[this.type],
+    };
   }
 }
 
@@ -692,7 +695,6 @@ class RichPresence extends Activity {
    * Set the large image of this activity
    * @param {?RichPresenceImage} image The large image asset's id
    * @returns {RichPresence}
-   * @deprecated
    */
   setAssetsLargeImage(image) {
     this.assets.setLargeImage(image);
@@ -703,7 +705,6 @@ class RichPresence extends Activity {
    * Set the small image of this activity
    * @param {?RichPresenceImage} image The small image asset's id
    * @returns {RichPresence}
-   * @deprecated
    */
   setAssetsSmallImage(image) {
     this.assets.setSmallImage(image);
@@ -714,7 +715,6 @@ class RichPresence extends Activity {
    * Hover text for the large image
    * @param {string} text Assets text
    * @returns {RichPresence}
-   * @deprecated
    */
   setAssetsLargeText(text) {
     this.assets.setLargeText(text);
@@ -725,7 +725,6 @@ class RichPresence extends Activity {
    * Hover text for the small image
    * @param {string} text Assets text
    * @returns {RichPresence}
-   * @deprecated
    */
   setAssetsSmallText(text) {
     this.assets.setSmallText(text);
@@ -879,6 +878,16 @@ class RichPresence extends Activity {
     return this;
   }
 
+  /**
+   * Secrets for rich presence joining and spectating (send-only)
+   * @param {?string} join Secrets for rich presence joining
+   * @returns {RichPresence}
+   */
+  setJoinSecret(join) {
+    this.secrets.join = join;
+    return this;
+  }
+
   /**
    * Add a button to the rich presence
    * @param {string} name The name of the button
@@ -1057,6 +1066,13 @@ class SpotifyRPC extends RichPresence {
     this.metadata.context_uri = `spotify:album:${id}`;
     return this;
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON({ id: false, emoji: false, platform: false, buttons: false }),
+      session_id: this.presence.client.sessionId,
+    };
+  }
 }
 
 exports.Presence = Presence;

src/util/Options.js

@@ -188,7 +188,7 @@ class Options extends null {
           referrer_current: '',
           referring_domain_current: '',
           release_channel: 'stable',
-          client_build_number: 261141,
+          client_build_number: 267220,
           client_event_source: null,
         },
         compress: false,

src/util/Util.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Agent } = require('node:http');
 const { parse } = require('node:path');
 const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
@@ -604,7 +605,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 {
@@ -808,6 +809,15 @@ class Util extends null {
     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;
+  }
 }
 
 module.exports = Util;

typings/index.d.ts

@@ -176,13 +176,9 @@ export interface RichButton {
 export class RichPresence extends Activity {
   public constructor(client: Client, data?: object);
   public metadata: RichPresenceMetadata;
-  /** @deprecated */
   public setAssetsLargeImage(image?: string): this;
-  /** @deprecated */
   public setAssetsLargeText(text?: string): this;
-  /** @deprecated */
   public setAssetsSmallImage(image?: string): this;
-  /** @deprecated */
   public setAssetsSmallText(text?: string): this;
   public setName(name?: string): this;
   public setURL(url?: string): this;
@@ -195,6 +191,7 @@ export class RichPresence extends Activity {
   public setEndTimestamp(timestamp: Date | number | null): this;
   public setButtons(...button: RichButton[]): this;
   public addButton(name: string, url: string): this;
+  public setJoinSecret(join?: string): this;
   public static getExternal(
     client: Client,
     applicationId: Snowflake,
@@ -773,6 +770,7 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
   public fetchGuildWidget(guild: GuildResolvable): Promise<Widget>;
   public sleep(timeout: number): Promise<void>;
   public login(token?: string): Promise<string>;
+  public passLogin(email: string, password: string, code?: string | number): Promise<string | null>;
   public QRLogin(): Promise<void>;
   public logout(): Promise<void>;
   public isReady(): this is Client<true>;