🐛 Check channel before responding to custom commands

Androz2091 · Dec 3, 2020 · 4d49c1d · 4d49c1d
1 parent d064c34
commit 4d49c1d
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/events/message.js b/events/message.js
@@ -128,19 +128,26 @@ module.exports = class {
 		const args = message.content.slice((typeof prefix === "string" ? prefix.length : 0)).trim().split(/ +/g);
 		const command = args.shift().toLowerCase();
 		const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command));
-
-		if(!cmd){
-			if(message.guild){
-				const customCommand = data.guild.customCommands.find((c) => c.name === command);
-				if(customCommand){
-					message.channel.send(customCommand.answer);
-				}
-				return;
-			} else {
-				return message.sendT("misc:HELLO_DM", {
-					username: message.author.username
-				});
-			}
+
+		const customCommand = message.guild ? data.guild.customCommands.find((c) => c.name === command) : null;
+		const customCommandAnswer = customCommand ? customCommandAnswer.answer : '';
+
+		if(!cmd && !customCommandAnswer){
+			return message.sendT("misc:HELLO_DM", {
+				username: message.author.username
+			});
+		}
+
+		if(data.guild.ignoredChannels.includes(message.channel.id) && !message.member.hasPermission("MANAGE_MESSAGES")){
+			message.delete();
+			message.author.send(message.translate("misc:RESTRICTED_CHANNEL", {
+				channel: message.channel.toString()
+			}));
+			return;
+		}
+
+		if (customCommandAnswer) {
+			return message.channel.send(customCommandAnswer);
 		}
 
 		if(cmd.conf.guildOnly && !message.guild){
@@ -173,14 +180,6 @@ module.exports = class {
 					list: neededPermissions.map((p) => `\`${p}\``).join(", ")
 				});
 			}
-			if(data.guild.ignoredChannels.includes(message.channel.id) && !message.member.hasPermission("MANAGE_MESSAGES")){
-				message.delete();
-				message.author.send(message.translate("misc:RESTRICTED_CHANNEL", {
-					channel: message.channel.toString()
-				}));
-				return;
-			}
-
 			if(!message.channel.permissionsFor(message.member).has("MENTION_EVERYONE") && (message.content.includes("@everyone") || message.content.includes("@here"))){
 				return message.error("misc:EVERYONE_MENTION");
 			}