Migrate messageCreate off sapphire (#328)

* Migrate messageCreate off sapphire

* Remove if (client.user) check

Author: KevinBacabac

src/bot.ts

@@ -1,10 +1,12 @@
 import dotenv from 'dotenv';
 dotenv.config();
 
+import { Message } from 'discord.js';
 import { container, LogLevel, SapphireClient, SapphirePrefix } from '@sapphire/framework';
 import '@sapphire/plugin-logger/register';
 import * as colorette from 'colorette';
 import { inspect } from 'util';
+import { initMessageCreate } from './events/messageCreate';
 import { initReady } from './events/ready';
 
 // Set default inspection depth
@@ -44,6 +46,9 @@ export const startBot = async (): Promise<void> => {
     });
     client.on('error', client.logger.error);
     client.on('ready', initReady);
+    client.on('messageCreate', (message: Message) => {
+      initMessageCreate(client, container.logger, message);
+    });
     client.login();
   } catch (e) {
     console.log('Bot failure');

src/listeners/messageCreate.ts renamed to src/events/messageCreate.ts

@@ -1,6 +1,5 @@
-import { ApplyOptions } from '@sapphire/decorators';
-import { container, Listener } from '@sapphire/framework';
-import { Message } from 'discord.js';
+import { ILogger } from '@sapphire/framework';
+import { Client, Message } from 'discord.js';
 import { applyBonusByUserId } from '../components/coin';
 import { vars } from '../config';
 import { sendKickEmbed } from '../utils/embeds';
@@ -43,8 +42,7 @@ const detectSpammersAndTrolls = (message: Message): boolean => {
  * Punish spammers/trolls/people who got hacked
  * Return true if someone of this kind is detected, false otherwise
  */
-const punishSpammersAndTrolls = async (message: Message): Promise<boolean> => {
-  const { logger } = container;
+const punishSpammersAndTrolls = async (client: Client, logger: ILogger, message: Message): Promise<boolean> => {
   if (detectSpammersAndTrolls(message)) {
     // Delete the message, and if the user is still in the server, then kick them and log it
     await message.delete();
@@ -61,7 +59,7 @@ const punishSpammersAndTrolls = async (message: Message): Promise<boolean> => {
           error: (err as Error).toString()
         });
       }
-      await sendKickEmbed(message, user, reason, isSuccessful);
+      await sendKickEmbed(client, message, user, reason, isSuccessful);
     }
     return true;
   }
@@ -97,34 +95,23 @@ const convertResumePdfsIntoImages = async (message: Message): Promise<Message<bo
   });
 };
 
-@ApplyOptions<Listener.Options>({
-  event: 'messageCreate'
-})
-export class MessageCreateListener extends Listener {
-  async run(message: Message): Promise<void> {
-    const { client } = container;
-
-    if (!client.user) {
-      return;
-    }
-
-    // Ignore all bots including self but not IRC
-    if (message.author.bot && message.author.id !== IRC_USER_ID) {
-      return;
-    }
+export const initMessageCreate = async (client: Client, logger: ILogger, message: Message): Promise<void> => {
+  // Ignore all bots including self but not IRC
+  if (message.author.bot && message.author.id !== IRC_USER_ID) {
+    return;
+  }
 
-    if (await punishSpammersAndTrolls(message)) {
-      return;
-    }
+  if (await punishSpammersAndTrolls(client, logger, message)) {
+    return;
+  }
 
-    // If channel is in resumes, convert the message attachment to an image
-    if (message.channelId === RESUME_CHANNEL_ID) {
-      await convertResumePdfsIntoImages(message);
-    }
+  // If channel is in resumes, convert the message attachment to an image
+  if (message.channelId === RESUME_CHANNEL_ID) {
+    await convertResumePdfsIntoImages(message);
+  }
 
-    // Ignore DMs; include announcements, thread, and regular text channels
-    if (message.channel.type !== 'DM') {
-      await applyBonusByUserId(message.author.id);
-    }
+  // Ignore DMs; include announcements, thread, and regular text channels
+  if (message.channel.type !== 'DM') {
+    await applyBonusByUserId(message.author.id);
   }
-}
+};

src/utils/embeds.ts

@@ -1,5 +1,4 @@
-import { container } from '@sapphire/framework';
-import { Message, MessageEmbed, TextChannel, User } from 'discord.js';
+import { Client, Message, MessageEmbed, TextChannel, User } from 'discord.js';
 import { vars } from '../config';
 
 const NOTIF_CHANNEL_ID: string = vars.NOTIF_CHANNEL_ID;
@@ -9,8 +8,13 @@ export const EMBED_COLOUR = '#0099ff';
 /*
  * Send kick embed
  */
-export const sendKickEmbed = async (message: Message, user: User, reason = '', isSuccessful = true): Promise<void> => {
-  const { client } = container;
+export const sendKickEmbed = async (
+  client: Client,
+  message: Message,
+  user: User,
+  reason = '',
+  isSuccessful = true
+): Promise<void> => {
   const kickEmbed = new MessageEmbed()
     .setColor(EMBED_COLOUR)
     .addField('User', `${user.tag} (${user.id})`)