refactor: rename events to be consistent with WS names (#6010)

Co-authored-by: Noel <buechler.noel@outlook.com>

src/client/actions/InteractionCreate.js

@@ -4,6 +4,8 @@ const Action = require('./Action');
 const { Events, InteractionTypes, MessageComponentTypes } = require('../../util/Constants');
 const Structures = require('../../util/Structures');
 
+let deprecationEmitted = false;
+
 class InteractionCreateAction extends Action {
   handle(data) {
     const client = this.client;
@@ -37,12 +39,25 @@ class InteractionCreateAction extends Action {
         return;
     }
 
+    const interaction = new InteractionType(client, data);
+
+    /**
+     * Emitted when an interaction is created.
+     * @event Client#interactionCreate
+     * @param {Interaction} interaction The interaction which was created
+     */
+    client.emit(Events.INTERACTION_CREATE, interaction);
+
     /**
      * Emitted when an interaction is created.
      * @event Client#interaction
      * @param {Interaction} interaction The interaction which was created
+     * @deprecated Use {@link Client#interactionCreate} instead
      */
-    client.emit(Events.INTERACTION_CREATE, new InteractionType(client, data));
+    if (client.emit('interaction', interaction) && !deprecationEmitted) {
+      deprecationEmitted = true;
+      process.emitWarning('The interaction event is deprecated. Use interactionCreate instead', 'DeprecationWarning');
+    }
   }
 }
 

src/client/actions/MessageCreate.js

@@ -3,6 +3,8 @@
 const Action = require('./Action');
 const { Events } = require('../../util/Constants');
 
+let deprecationEmitted = false;
+
 class MessageCreateAction extends Action {
   handle(data) {
     const client = this.client;
@@ -25,10 +27,22 @@ class MessageCreateAction extends Action {
 
       /**
        * Emitted whenever a message is created.
-       * @event Client#message
+       * @event Client#messageCreate
        * @param {Message} message The created message
        */
       client.emit(Events.MESSAGE_CREATE, message);
+
+      /**
+       * Emitted whenever a message is created.
+       * @event Client#message
+       * @param {Message} message The created message
+       * @deprecated Use {@link Client#messageCreate} instead
+       */
+      if (client.emit('message', message) && !deprecationEmitted) {
+        deprecationEmitted = true;
+        process.emitWarning('The message event is deprecated. Use messageCreate instead', 'DeprecationWarning');
+      }
+
       return { message };
     }
 

src/util/Constants.js

@@ -255,7 +255,7 @@ exports.Events = {
   CHANNEL_DELETE: 'channelDelete',
   CHANNEL_UPDATE: 'channelUpdate',
   CHANNEL_PINS_UPDATE: 'channelPinsUpdate',
-  MESSAGE_CREATE: 'message',
+  MESSAGE_CREATE: 'messageCreate',
   MESSAGE_DELETE: 'messageDelete',
   MESSAGE_UPDATE: 'messageUpdate',
   MESSAGE_BULK_DELETE: 'messageDeleteBulk',
@@ -275,7 +275,7 @@ exports.Events = {
   VOICE_STATE_UPDATE: 'voiceStateUpdate',
   TYPING_START: 'typingStart',
   WEBHOOKS_UPDATE: 'webhookUpdate',
-  INTERACTION_CREATE: 'interaction',
+  INTERACTION_CREATE: 'interactionCreate',
   ERROR: 'error',
   WARN: 'warn',
   DEBUG: 'debug',