From 171e917fb96b6bf39a6ad70e83be646f72fe451e Mon Sep 17 00:00:00 2001
From: "Matt (IPv4) Cowley" <me@mattcowley.co.uk>
Date: Sat, 8 Jan 2022 13:43:12 +0000
Subject: [PATCH] refactor(MessageCreate): remove message event (#6324)

---
 .../discord.js/src/client/actions/MessageCreate.js | 14 --------------
 packages/discord.js/test/tester2000.js             |  2 +-
 packages/discord.js/typings/index.d.ts             |  2 --
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/packages/discord.js/src/client/actions/MessageCreate.js b/packages/discord.js/src/client/actions/MessageCreate.js
index 894886e64..df81258e0 100644
--- a/packages/discord.js/src/client/actions/MessageCreate.js
+++ b/packages/discord.js/src/client/actions/MessageCreate.js
@@ -1,11 +1,8 @@
 'use strict';
 
-const process = require('node:process');
 const Action = require('./Action');
 const { Events } = require('../../util/Constants');
 
-let deprecationEmitted = false;
-
 class MessageCreateAction extends Action {
   handle(data) {
     const client = this.client;
@@ -25,17 +22,6 @@ class MessageCreateAction extends Action {
        */
       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#event:messageCreate} instead
-       */
-      if (client.emit('message', message) && !deprecationEmitted) {
-        deprecationEmitted = true;
-        process.emitWarning('The message event is deprecated. Use messageCreate instead', 'DeprecationWarning');
-      }
-
       return { message };
     }
 
diff --git a/packages/discord.js/test/tester2000.js b/packages/discord.js/test/tester2000.js
index ac4e14801..4391c9af1 100644
--- a/packages/discord.js/test/tester2000.js
+++ b/packages/discord.js/test/tester2000.js
@@ -48,7 +48,7 @@ const commands = {
   ping: message => message.channel.send('pong'),
 };
 
-client.on('message', message => {
+client.on('messageCreate', message => {
   if (!message.content.startsWith(prefix) || message.author.bot) return;
 
   message.content = message.content.replace(prefix, '').trim().split(' ');
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index 81cd3c2e7..ed5cad623 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -3899,8 +3899,6 @@ export interface ClientEvents extends BaseClientEvents {
   guildUpdate: [oldGuild: Guild, newGuild: Guild];
   inviteCreate: [invite: Invite];
   inviteDelete: [invite: Invite];
-  /** @deprecated Use messageCreate instead */
-  message: [message: Message];
   messageCreate: [message: Message];
   messageDelete: [message: Message | PartialMessage];
   messageReactionRemoveAll: [