From 495d99ca5d0881256510358f48bcd57452d392a8 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Sun, 8 Mar 2020 11:31:53 -0400 Subject: [PATCH] Remove NSFW Commands from Unknown Commands if not in an NSFW Channel --- commands/util/unknown-command.js | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/commands/util/unknown-command.js b/commands/util/unknown-command.js index c072d8c2..e44c8b8d 100644 --- a/commands/util/unknown-command.js +++ b/commands/util/unknown-command.js @@ -16,7 +16,8 @@ module.exports = class UnknownCommandCommand extends Command { } run(msg) { - const commands = this.makeCommandArray(this.client.isOwner(msg.author)); + if (msg.channel.type !== 'text') return null; + const commands = this.makeCommandArray(this.client.isOwner(msg.author), msg.channel.nsfw); const command = msg.content.match(this.client.dispatcher._commandPatterns[this.client.commandPrefix]); const str = command ? command[2] : msg.content.split(' ')[0]; const results = didYouMean(str, commands, { returnType: ReturnTypeEnums.ALL_SORTED_MATCHES }); @@ -28,11 +29,12 @@ module.exports = class UnknownCommandCommand extends Command { `); } - makeCommandArray(owner) { + makeCommandArray(owner, nsfw) { const arr = []; for (const command of this.client.registry.commands.values()) { if (!owner && command.ownerOnly) continue; if (command.hidden) continue; + if (!nsfw && command.nsfw) continue; if (!command.name.includes('-')) arr.push(command.name); arr.push(...command.aliases.filter(alias => !alias.includes('-'))); } diff --git a/package.json b/package.json index d4605634..048dc8d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "112.2.4", + "version": "112.2.5", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {