Skip to content

fix(Client): Move client initialization code #11184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+7 −10
Open

fix(Client): Move client initialization code #11184

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c16942f
Update index.js
vakiliner Oct 16, 2025
ce7facb
Fix
vakiliner Oct 16, 2025
382f331
Fix path to ClientUser
vakiliner Oct 16, 2025
3b16e5f
Update Client.js
vakiliner Oct 16, 2025
117893b
Merge branch 'main' into patch-1
vakiliner Oct 16, 2025
4ab11b1
Migrating back to READY.js
vakiliner Oct 19, 2025
a4c0a24
Move _checkReady()
vakiliner Oct 19, 2025
61a4a0d
Merge branch 'main' into patch-1
Jiralite Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion packages/discord.js/src/client/Client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const { ChannelManager } = require('../managers/ChannelManager.js');
const { GuildManager } = require('../managers/GuildManager.js');
const { UserManager } = require('../managers/UserManager.js');
const { ShardClientUtil } = require('../sharding/ShardClientUtil.js');
const { ClientApplication } = require('../structures/ClientApplication.js');
const { ClientPresence } = require('../structures/ClientPresence.js');
const { GuildPreview } = require('../structures/GuildPreview.js');
const { GuildTemplate } = require('../structures/GuildTemplate.js');
Expand Down Expand Up @@ -44,6 +45,8 @@ const BeforeReadyWhitelist = [
GatewayDispatchEvents.GuildMemberRemove,
];

let ClientUser;

/**
* The main hub for interacting with the Discord API, and the starting point for any bot.
*
Expand Down Expand Up @@ -346,9 +349,25 @@ class Client extends BaseClient {
);
this.ws.on(WebSocketShardEvents.Dispatch, this._handlePacket.bind(this));

this.ws.on(WebSocketShardEvents.Ready, async data => {
this.ws.on(WebSocketShardEvents.Ready, async (data, shardId) => {
if (this.user) {
this.user._patch(data.user);
} else {
ClientUser ??= require('../structures/ClientUser.js').ClientUser;
this.user = new ClientUser(this, data.user);
this.users.cache.set(this.user.id, this.user);
}

for (const guild of data.guilds) {
this.expectedGuilds.add(guild.id);
guild.shardId = shardId;
this.guilds._add(guild);
}

if (this.application) {
this.application._patch(data.application);
} else {
this.application = new ClientApplication(this, data.application);
}

this.status = Status.WaitingForGuilds;
Expand Down
26 changes: 0 additions & 26 deletions packages/discord.js/src/client/websocket/handlers/READY.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/discord.js/src/client/websocket/handlers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ const PacketHandlers = Object.fromEntries([
['MESSAGE_REACTION_REMOVE_EMOJI', require('./MESSAGE_REACTION_REMOVE_EMOJI.js')],
['MESSAGE_UPDATE', require('./MESSAGE_UPDATE.js')],
['PRESENCE_UPDATE', require('./PRESENCE_UPDATE.js')],
['READY', require('./READY.js')],
['SOUNDBOARD_SOUNDS', require('./SOUNDBOARD_SOUNDS.js')],
['STAGE_INSTANCE_CREATE', require('./STAGE_INSTANCE_CREATE.js')],
['STAGE_INSTANCE_DELETE', require('./STAGE_INSTANCE_DELETE.js')],
Expand Down