refactor: Make constants enums top level and PascalCase (#7379)

Co-authored-by: Vitor <milagre.vitor@gmail.com> Co-authored-by: almeidx <almeidx@pm.me>
discordjs · Feb 5, 2022 · d8184f9 · d8184f9
1 parent cd2f566
commit d8184f9
Show file tree

Hide file tree

Showing 81 changed files with 625 additions and 640 deletions.
diff --git a/packages/discord.js/src/client/Client.js b/packages/discord.js/src/client/Client.js
@@ -22,11 +22,13 @@ const StickerPack = require('../structures/StickerPack');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
 const Widget = require('../structures/Widget');
-const { Events, InviteScopes, Status } = require('../util/Constants');
+const { InviteScopes } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
+const Events = require('../util/Events');
 const IntentsBitField = require('../util/IntentsBitField');
 const Options = require('../util/Options');
 const PermissionsBitField = require('../util/PermissionsBitField');
+const Status = require('../util/Status');
 const Sweepers = require('../util/Sweepers');
 
 /**
@@ -213,7 +215,7 @@ class Client extends BaseClient {
     this.token = token = token.replace(/^(Bot|Bearer)\s*/i, '');
     this.rest.setToken(token);
     this.emit(
-      Events.DEBUG,
+      Events.Debug,
       `Provided token: ${token
         .split('.')
         .map((val, i) => (i > 1 ? val.replace(/./g, '*') : val))
@@ -224,7 +226,7 @@ class Client extends BaseClient {
       this.options.ws.presence = this.presence._parse(this.options.presence);
     }
 
-    this.emit(Events.DEBUG, 'Preparing to connect to the gateway...');
+    this.emit(Events.Debug, 'Preparing to connect to the gateway...');
 
     try {
       await this.ws.connect();
@@ -241,7 +243,7 @@ class Client extends BaseClient {
    * @returns {boolean}
    */
   isReady() {
-    return this.ws.status === Status.READY;
+    return this.ws.status === Status.Ready;
   }
 
   /**

diff --git a/packages/discord.js/src/client/actions/ChannelCreate.js b/packages/discord.js/src/client/actions/ChannelCreate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class ChannelCreateAction extends Action {
   handle(data) {
@@ -14,7 +14,7 @@ class ChannelCreateAction extends Action {
        * @event Client#channelCreate
        * @param {GuildChannel} channel The channel that was created
        */
-      client.emit(Events.CHANNEL_CREATE, channel);
+      client.emit(Events.ChannelCreate, channel);
     }
     return { channel };
   }

diff --git a/packages/discord.js/src/client/actions/ChannelDelete.js b/packages/discord.js/src/client/actions/ChannelDelete.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class ChannelDeleteAction extends Action {
   handle(data) {
@@ -15,7 +15,7 @@ class ChannelDeleteAction extends Action {
        * @event Client#channelDelete
        * @param {DMChannel|GuildChannel} channel The channel that was deleted
        */
-      client.emit(Events.CHANNEL_DELETE, channel);
+      client.emit(Events.ChannelDelete, channel);
     }
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildBanAdd.js b/packages/discord.js/src/client/actions/GuildBanAdd.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildBanAdd extends Action {
   handle(data) {
@@ -13,7 +13,7 @@ class GuildBanAdd extends Action {
      * @event Client#guildBanAdd
      * @param {GuildBan} ban The ban that occurred
      */
-    if (guild) client.emit(Events.GUILD_BAN_ADD, guild.bans._add(data));
+    if (guild) client.emit(Events.GuildBanAdd, guild.bans._add(data));
   }
 }
 

diff --git a/packages/discord.js/src/client/actions/GuildBanRemove.js b/packages/discord.js/src/client/actions/GuildBanRemove.js
@@ -2,7 +2,7 @@
 
 const Action = require('./Action');
 const GuildBan = require('../../structures/GuildBan');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildBanRemove extends Action {
   handle(data) {
@@ -17,7 +17,7 @@ class GuildBanRemove extends Action {
     if (guild) {
       const ban = guild.bans.cache.get(data.user.id) ?? new GuildBan(client, data, guild);
       guild.bans.cache.delete(ban.user.id);
-      client.emit(Events.GUILD_BAN_REMOVE, ban);
+      client.emit(Events.GuildBanRemove, ban);
     }
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildDelete.js b/packages/discord.js/src/client/actions/GuildDelete.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildDeleteAction extends Action {
   handle(data) {
@@ -18,7 +18,7 @@ class GuildDeleteAction extends Action {
          * @event Client#guildUnavailable
          * @param {Guild} guild The guild that has become unavailable
          */
-        client.emit(Events.GUILD_UNAVAILABLE, guild);
+        client.emit(Events.GuildUnavailable, guild);
 
         // Stops the GuildDelete packet thinking a guild was actually deleted,
         // handles emitting of event itself
@@ -36,7 +36,7 @@ class GuildDeleteAction extends Action {
        * @event Client#guildDelete
        * @param {Guild} guild The guild that was deleted
        */
-      client.emit(Events.GUILD_DELETE, guild);
+      client.emit(Events.GuildDelete, guild);
     }
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildEmojiCreate.js b/packages/discord.js/src/client/actions/GuildEmojiCreate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildEmojiCreateAction extends Action {
   handle(guild, createdEmoji) {
@@ -12,7 +12,7 @@ class GuildEmojiCreateAction extends Action {
      * @event Client#emojiCreate
      * @param {GuildEmoji} emoji The emoji that was created
      */
-    if (!already) this.client.emit(Events.GUILD_EMOJI_CREATE, emoji);
+    if (!already) this.client.emit(Events.GuildEmojiCreate, emoji);
     return { emoji };
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildEmojiDelete.js b/packages/discord.js/src/client/actions/GuildEmojiDelete.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildEmojiDeleteAction extends Action {
   handle(emoji) {
@@ -11,7 +11,7 @@ class GuildEmojiDeleteAction extends Action {
      * @event Client#emojiDelete
      * @param {GuildEmoji} emoji The emoji that was deleted
      */
-    this.client.emit(Events.GUILD_EMOJI_DELETE, emoji);
+    this.client.emit(Events.GuildEmojiDelete, emoji);
     return { emoji };
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildEmojiUpdate.js b/packages/discord.js/src/client/actions/GuildEmojiUpdate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildEmojiUpdateAction extends Action {
   handle(current, data) {
@@ -12,7 +12,7 @@ class GuildEmojiUpdateAction extends Action {
      * @param {GuildEmoji} oldEmoji The old emoji
      * @param {GuildEmoji} newEmoji The new emoji
      */
-    this.client.emit(Events.GUILD_EMOJI_UPDATE, old, current);
+    this.client.emit(Events.GuildEmojiUpdate, old, current);
     return { emoji: current };
   }
 }

diff --git a/packages/discord.js/src/client/actions/GuildIntegrationsUpdate.js b/packages/discord.js/src/client/actions/GuildIntegrationsUpdate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildIntegrationsUpdate extends Action {
   handle(data) {
@@ -12,7 +12,7 @@ class GuildIntegrationsUpdate extends Action {
      * @event Client#guildIntegrationsUpdate
      * @param {Guild} guild The guild whose integrations were updated
      */
-    if (guild) client.emit(Events.GUILD_INTEGRATIONS_UPDATE, guild);
+    if (guild) client.emit(Events.GuildIntegrationsUpdate, guild);
   }
 }
 

diff --git a/packages/discord.js/src/client/actions/GuildMemberRemove.js b/packages/discord.js/src/client/actions/GuildMemberRemove.js
@@ -1,7 +1,8 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events, Status } = require('../../util/Constants');
+const Events = require('../../util/Events');
+const Status = require('../../util/Status');
 
 class GuildMemberRemoveAction extends Action {
   handle(data, shard) {
@@ -18,7 +19,7 @@ class GuildMemberRemoveAction extends Action {
          * @event Client#guildMemberRemove
          * @param {GuildMember} member The member that has left/been kicked from the guild
          */
-        if (shard.status === Status.READY) client.emit(Events.GUILD_MEMBER_REMOVE, member);
+        if (shard.status === Status.Ready) client.emit(Events.GuildMemberRemove, member);
       }
       guild.voiceStates.cache.delete(data.user.id);
     }

diff --git a/packages/discord.js/src/client/actions/GuildMemberUpdate.js b/packages/discord.js/src/client/actions/GuildMemberUpdate.js
@@ -1,7 +1,8 @@
 'use strict';
 
 const Action = require('./Action');
-const { Status, Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
+const Status = require('../../util/Status');
 
 class GuildMemberUpdateAction extends Action {
   handle(data, shard) {
@@ -26,15 +27,15 @@ class GuildMemberUpdateAction extends Action {
          * @param {GuildMember} oldMember The member before the update
          * @param {GuildMember} newMember The member after the update
          */
-        if (shard.status === Status.READY && !member.equals(old)) client.emit(Events.GUILD_MEMBER_UPDATE, old, member);
+        if (shard.status === Status.Ready && !member.equals(old)) client.emit(Events.GuildMemberUpdate, old, member);
       } else {
         const newMember = guild.members._add(data);
         /**
          * Emitted whenever a member becomes available in a large guild.
          * @event Client#guildMemberAvailable
          * @param {GuildMember} member The member that became available
          */
-        this.client.emit(Events.GUILD_MEMBER_AVAILABLE, newMember);
+        this.client.emit(Events.GuildMemberAvailable, newMember);
       }
     }
   }

diff --git a/packages/discord.js/src/client/actions/GuildRoleCreate.js b/packages/discord.js/src/client/actions/GuildRoleCreate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildRoleCreate extends Action {
   handle(data) {
@@ -16,7 +16,7 @@ class GuildRoleCreate extends Action {
        * @event Client#roleCreate
        * @param {Role} role The role that was created
        */
-      if (!already) client.emit(Events.GUILD_ROLE_CREATE, role);
+      if (!already) client.emit(Events.GuildRoleCreate, role);
     }
     return { role };
   }

diff --git a/packages/discord.js/src/client/actions/GuildRoleDelete.js b/packages/discord.js/src/client/actions/GuildRoleDelete.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildRoleDeleteAction extends Action {
   handle(data) {
@@ -18,7 +18,7 @@ class GuildRoleDeleteAction extends Action {
          * @event Client#roleDelete
          * @param {Role} role The role that was deleted
          */
-        client.emit(Events.GUILD_ROLE_DELETE, role);
+        client.emit(Events.GuildRoleDelete, role);
       }
     }
 

diff --git a/packages/discord.js/src/client/actions/GuildRoleUpdate.js b/packages/discord.js/src/client/actions/GuildRoleUpdate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildRoleUpdateAction extends Action {
   handle(data) {
@@ -20,7 +20,7 @@ class GuildRoleUpdateAction extends Action {
          * @param {Role} oldRole The role before the update
          * @param {Role} newRole The role after the update
          */
-        client.emit(Events.GUILD_ROLE_UPDATE, old, role);
+        client.emit(Events.GuildRoleUpdate, old, role);
       }
 
       return {

diff --git a/packages/discord.js/src/client/actions/GuildScheduledEventCreate.js b/packages/discord.js/src/client/actions/GuildScheduledEventCreate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildScheduledEventCreateAction extends Action {
   handle(data) {
@@ -15,7 +15,7 @@ class GuildScheduledEventCreateAction extends Action {
        * @event Client#guildScheduledEventCreate
        * @param {GuildScheduledEvent} guildScheduledEvent The created guild scheduled event
        */
-      client.emit(Events.GUILD_SCHEDULED_EVENT_CREATE, guildScheduledEvent);
+      client.emit(Events.GuildScheduledEventCreate, guildScheduledEvent);
 
       return { guildScheduledEvent };
     }

diff --git a/packages/discord.js/src/client/actions/GuildScheduledEventDelete.js b/packages/discord.js/src/client/actions/GuildScheduledEventDelete.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildScheduledEventDeleteAction extends Action {
   handle(data) {
@@ -18,7 +18,7 @@ class GuildScheduledEventDeleteAction extends Action {
          * @event Client#guildScheduledEventDelete
          * @param {GuildScheduledEvent} guildScheduledEvent The deleted guild scheduled event
          */
-        client.emit(Events.GUILD_SCHEDULED_EVENT_DELETE, guildScheduledEvent);
+        client.emit(Events.GuildScheduledEventDelete, guildScheduledEvent);
 
         return { guildScheduledEvent };
       }

diff --git a/packages/discord.js/src/client/actions/GuildScheduledEventUpdate.js b/packages/discord.js/src/client/actions/GuildScheduledEventUpdate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildScheduledEventUpdateAction extends Action {
   handle(data) {
@@ -18,7 +18,7 @@ class GuildScheduledEventUpdateAction extends Action {
        * @param {?GuildScheduledEvent} oldGuildScheduledEvent The guild scheduled event object before the update
        * @param {GuildScheduledEvent} newGuildScheduledEvent The guild scheduled event object after the update
        */
-      client.emit(Events.GUILD_SCHEDULED_EVENT_UPDATE, oldGuildScheduledEvent, newGuildScheduledEvent);
+      client.emit(Events.GuildScheduledEventUpdate, oldGuildScheduledEvent, newGuildScheduledEvent);
 
       return { oldGuildScheduledEvent, newGuildScheduledEvent };
     }

diff --git a/packages/discord.js/src/client/actions/GuildScheduledEventUserAdd.js b/packages/discord.js/src/client/actions/GuildScheduledEventUserAdd.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const Events = require('../../util/Events');
 
 class GuildScheduledEventUserAddAction extends Action {
   handle(data) {
@@ -19,7 +19,7 @@ class GuildScheduledEventUserAddAction extends Action {
          * @param {GuildScheduledEvent} guildScheduledEvent The guild scheduled event
          * @param {User} user The user who subscribed
          */
-        client.emit(Events.GUILD_SCHEDULED_EVENT_USER_ADD, guildScheduledEvent, user);
+        client.emit(Events.GuildScheduledEventUserAdd, guildScheduledEvent, user);
 
         return { guildScheduledEvent, user };
       }