Skip to content

Commit 82378fc

Browse files
JiralitevladfranguQjuh
authored
refactor: Deprecate ready event in favor of clientReady (#10969)
* refactor: deprecate ready event * refactor: tweak message Co-Authored-By: Vlad Frangu <[email protected]> * Update packages/discord.js/src/client/websocket/WebSocketManager.js Co-authored-by: Qjuh <[email protected]> * chore: disable max-len --------- Co-authored-by: Vlad Frangu <[email protected]> Co-authored-by: Qjuh <[email protected]>
1 parent d4f742e commit 82378fc

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

packages/discord.js/src/client/websocket/WebSocketManager.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const Status = require('../../util/Status');
1919
const WebSocketShardEvents = require('../../util/WebSocketShardEvents');
2020

2121
let zlib;
22+
let deprecationEmitted = false;
2223

2324
try {
2425
zlib = require('zlib-sync');
@@ -379,6 +380,22 @@ class WebSocketManager extends EventEmitter {
379380
/**
380381
* Emitted when the client becomes ready to start working.
381382
* @event Client#ready
383+
* @deprecated Use {@link Client#event:clientReady} instead.
384+
* @param {Client} client The client
385+
*/
386+
if (this.client.emit('ready', this.client) && !deprecationEmitted) {
387+
deprecationEmitted = true;
388+
389+
process.emitWarning(
390+
// eslint-disable-next-line max-len
391+
'The ready event has been renamed to clientReady to distinguish it from the gateway READY event and will only emit under that name in v15. Please use clientReady instead.',
392+
'DeprecationWarning',
393+
);
394+
}
395+
396+
/**
397+
* Emitted when the client becomes ready to start working.
398+
* @event Client#clientReady
382399
* @param {Client} client The client
383400
*/
384401
this.client.emit(Events.ClientReady, this.client);

packages/discord.js/src/util/Events.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @property {string} ChannelDelete channelDelete
1313
* @property {string} ChannelPinsUpdate channelPinsUpdate
1414
* @property {string} ChannelUpdate channelUpdate
15-
* @property {string} ClientReady ready
15+
* @property {string} ClientReady clientReady
1616
* @property {string} Debug debug
1717
* @property {string} EntitlementCreate entitlementCreate
1818
* @property {string} EntitlementUpdate entitlementUpdate
@@ -108,7 +108,7 @@ module.exports = {
108108
ChannelDelete: 'channelDelete',
109109
ChannelPinsUpdate: 'channelPinsUpdate',
110110
ChannelUpdate: 'channelUpdate',
111-
ClientReady: 'ready',
111+
ClientReady: 'clientReady',
112112
Debug: 'debug',
113113
EntitlementCreate: 'entitlementCreate',
114114
EntitlementUpdate: 'entitlementUpdate',

packages/discord.js/typings/index.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5790,6 +5790,7 @@ export interface ClientEvents {
57905790
oldChannel: DMChannel | NonThreadGuildBasedChannel,
57915791
newChannel: DMChannel | NonThreadGuildBasedChannel,
57925792
];
5793+
clientReady: [client: Client<true>];
57935794
debug: [message: string];
57945795
warn: [message: string];
57955796
emojiCreate: [emoji: GuildEmoji];
@@ -5850,6 +5851,7 @@ export interface ClientEvents {
58505851
newMessage: OmitPartialGroupDMChannel<Message>,
58515852
];
58525853
presenceUpdate: [oldPresence: Presence | null, newPresence: Presence];
5854+
/** @deprecated Use {@link ClientEvents.ClientReady} instead. */
58535855
ready: [client: Client<true>];
58545856
invalidated: [];
58555857
roleCreate: [role: Role];
@@ -6035,7 +6037,7 @@ export enum Events {
60356037
AutoModerationRuleCreate = 'autoModerationRuleCreate',
60366038
AutoModerationRuleDelete = 'autoModerationRuleDelete',
60376039
AutoModerationRuleUpdate = 'autoModerationRuleUpdate',
6038-
ClientReady = 'ready',
6040+
ClientReady = 'clientReady',
60396041
EntitlementCreate = 'entitlementCreate',
60406042
EntitlementDelete = 'entitlementDelete',
60416043
EntitlementUpdate = 'entitlementUpdate',

0 commit comments

Comments
 (0)