From 3fc7b6d00a009485337e9d5e22733967cef3eade Mon Sep 17 00:00:00 2001 From: Karar Al-Remahy Date: Tue, 13 Jul 2021 21:16:31 +0200 Subject: [PATCH] fix: Allow async handlers to fail --- app.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index aff644c..e7ba009 100644 --- 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. } } })