fix: Allow async handlers to fail

KararTY · Jul 13, 2021 · 3fc7b6d · 3fc7b6d
1 parent 603fcf2
commit 3fc7b6d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -718,7 +718,7 @@ async function sendMessage (guildID, streamerInfo, { cachedImage, streamInfo, ga
   return Promise.resolve()
 }
 
-client.on('message', message => {
+client.on('message', async message => {
   let allow = false
 
   if (message.guild && message.member) {
@@ -745,7 +745,10 @@ client.on('message', message => {
     const cleanedMessage = message.content.replace(new RegExp(`^<@${client.user.id}> `), '!')
     if (message.cleanContent.startsWith(data.guilds[message.guild.id].prefix || '!') || message.mentions.users.find(u => u.id === client.user.id)) {
       const command = commands(translateDefault(data.guilds[message.guild.id].language)).find(command => command.commandNames.indexOf(cleanedMessage.split(/[ ]+/)[0].toLowerCase().substr(data.guilds[message.guild.id].prefix.length)) > -1)
-      if (command) command.handler(new Message(message)) || message.reply(command.showHelpText(new Message(message))) // Handle command.
+      if (!command) return
+
+      const handled = await command.handler(new Message(message))
+      if (typeof handled === 'boolean' && handled === false) message.reply(command.showHelpText(new Message(message))) // Handle command.
     }
   }
 })