fix(message): return if the bot doesn't have SEND_MESSAGES permission

h-projects · Oct 13, 2021 · 2ec00ed · 2ec00ed
1 parent 641c19a
commit 2ec00ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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);
   }