From 2ec00ed16f24e038965a712c06e3d912a008dcec Mon Sep 17 00:00:00 2001 From: Superchupu Date: Wed, 13 Oct 2021 14:19:09 +0100 Subject: [PATCH] fix(message): return if the bot doesn't have `SEND_MESSAGES` permission --- events/messageCreate.js | 5 +++-- events/messageUpdate.js | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/events/messageCreate.js b/events/messageCreate.js index d9400a3..cd56b5c 100644 --- a/events/messageCreate.js +++ b/events/messageCreate.js @@ -2,7 +2,8 @@ module.exports = { name: 'messageCreate', once: false, async execute(message, client) { - if (message.author.bot || message.author.system || message.type !== 'DEFAULT' && message.type !== 'REPLY' || !message.content) { + const { author, type } = message; + if (author.bot || author.system || type !== 'DEFAULT' && type !== 'REPLY' || !message.content || !message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { return; } const database = client.db.prepare('SELECT * FROM guilds WHERE id = ?').get(message.guildId); @@ -26,7 +27,7 @@ module.exports = { return; } - if (!client.commands.has(array[0]) || !message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { + if (!client.commands.has(array[0])) { return; } diff --git a/events/messageUpdate.js b/events/messageUpdate.js index 5966df8..fd50295 100644 --- a/events/messageUpdate.js +++ b/events/messageUpdate.js @@ -6,7 +6,11 @@ module.exports = { await newMessage.fetch(); } - if (newMessage.author.bot || newMessage.author.system || newMessage.type !== 'DEFAULT' && newMessage.type !== 'REPLY' || !newMessage.content) return; + const { author, type } = newMessage; + if (author.bot || author.system || type !== 'DEFAULT' && type !== 'REPLY' || !newMessage.content || !newMessage.channel.permissionsFor(client.user).has('SEND_MESSAGES')){ + return; + } + const database = client.db.prepare('SELECT * FROM guilds WHERE id = ?').get(newMessage.guildId); require('../detector/detector.js')(client, newMessage, database, true); }