mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-12 01:23:31 +01:00
Merge master into voice-rewrite
This commit is contained in:
@@ -42,6 +42,7 @@ class BaseClient extends EventEmitter {
|
||||
/**
|
||||
* API shortcut
|
||||
* @type {Object}
|
||||
* @readonly
|
||||
* @private
|
||||
*/
|
||||
get api() {
|
||||
|
||||
@@ -163,6 +163,7 @@ class Client extends BaseClient {
|
||||
/**
|
||||
* Timestamp of the latest ping's start time
|
||||
* @type {number}
|
||||
* @readonly
|
||||
* @private
|
||||
*/
|
||||
get _pingTimestamp() {
|
||||
|
||||
@@ -3,7 +3,7 @@ const BaseClient = require('./BaseClient');
|
||||
|
||||
/**
|
||||
* The webhook client.
|
||||
* @extends {Webhook}
|
||||
* @implements {Webhook}
|
||||
* @extends {BaseClient}
|
||||
*/
|
||||
class WebhookClient extends BaseClient {
|
||||
|
||||
@@ -15,7 +15,7 @@ const libs = {
|
||||
|
||||
exports.methods = {};
|
||||
|
||||
(async() => {
|
||||
(async () => {
|
||||
for (const libName of Object.keys(libs)) {
|
||||
try {
|
||||
const lib = require(libName);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const AbstractHandler = require('./AbstractHandler');
|
||||
const { Events } = require('../../../../util/Constants');
|
||||
const ClientUser = require('../../../../structures/ClientUser');
|
||||
let ClientUser;
|
||||
|
||||
class ReadyHandler extends AbstractHandler {
|
||||
handle(packet) {
|
||||
@@ -12,6 +12,7 @@ class ReadyHandler extends AbstractHandler {
|
||||
data.user.user_settings = data.user_settings;
|
||||
data.user.user_guild_settings = data.user_guild_settings;
|
||||
|
||||
if (!ClientUser) ClientUser = require('../../../../structures/ClientUser');
|
||||
const clientUser = new ClientUser(client, data.user);
|
||||
client.user = clientUser;
|
||||
client.readyAt = new Date();
|
||||
|
||||
Reference in New Issue
Block a user