From b796e3fe066eba64d3bcfcf3ce6f4e8800b892c2 Mon Sep 17 00:00:00 2001 From: nolan Date: Thu, 10 Jun 2021 18:08:31 -0700 Subject: [PATCH] merge --- .../client/components/commands/administration/MassBan.js | 2 +- .../client/components/commands/administration/Settings.js | 3 ++- .../client/components/commands/miscellaneous/MusicTaste.js | 3 ++- .../client/components/commands/moderation/Lockdown.js | 3 ++- structure/client/components/commands/moderation/Unban.js | 7 ------- .../client/components/commands/moderation/Unlockdown.js | 3 ++- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/structure/client/components/commands/administration/MassBan.js b/structure/client/components/commands/administration/MassBan.js index 71bf92d..cdf39bc 100644 --- a/structure/client/components/commands/administration/MassBan.js +++ b/structure/client/components/commands/administration/MassBan.js @@ -16,7 +16,7 @@ class MassBanCommand extends Command { "@nolan#2887 @Navy.gif#1998 24h raiding the server" ], restricted: true, - hidden: true, + archivable: false, arguments: [ { name: 'points', diff --git a/structure/client/components/commands/administration/Settings.js b/structure/client/components/commands/administration/Settings.js index 8483e0d..faf2e27 100644 --- a/structure/client/components/commands/administration/Settings.js +++ b/structure/client/components/commands/administration/Settings.js @@ -59,7 +59,8 @@ class SettingsCommand extends Command { const type = !message.guild || args.user ? 'USER' : 'GUILD'; if(type === 'GUILD') { - const permissions = this.client.permissions.execute(message, message.command, ['ADMINISTRATOR', 'MANAGE_GUILD']); + const permissions = await this.client.permissions.execute(message, message.command, ['ADMINISTRATOR', 'MANAGE_GUILD']); + console.log(permissions); if(permissions.error) return message.respond(message.format('C_SETTINGS_MISSINGPERMISSIONS'), { emoji: 'failure' }); diff --git a/structure/client/components/commands/miscellaneous/MusicTaste.js b/structure/client/components/commands/miscellaneous/MusicTaste.js index 8d7f673..1bc6c8d 100644 --- a/structure/client/components/commands/miscellaneous/MusicTaste.js +++ b/structure/client/components/commands/miscellaneous/MusicTaste.js @@ -22,7 +22,8 @@ class MusicTasteCommand extends Command { default: true } ], - disabled: true + disabled: true, + archivable: false }); this.client = client; diff --git a/structure/client/components/commands/moderation/Lockdown.js b/structure/client/components/commands/moderation/Lockdown.js index 4dde710..b28f611 100644 --- a/structure/client/components/commands/moderation/Lockdown.js +++ b/structure/client/components/commands/moderation/Lockdown.js @@ -23,7 +23,8 @@ class LockdownCommand extends Command { throttling: { usages: 2, duration: 10 - } + }, + archivable: false }); } diff --git a/structure/client/components/commands/moderation/Unban.js b/structure/client/components/commands/moderation/Unban.js index 360d262..316749e 100644 --- a/structure/client/components/commands/moderation/Unban.js +++ b/structure/client/components/commands/moderation/Unban.js @@ -24,11 +24,6 @@ class UnbanCommand extends Command { type: 'BOOLEAN', types: ['FLAG'], default: true - }, - { - name: 'search', - type: 'STRING', - types: ['FLAG', 'VERBAL'] } ], guildOnly: true, @@ -45,8 +40,6 @@ class UnbanCommand extends Command { async execute(message, { qParams }) { - // TODO: Implement search of banlist - const { parsed, parameters } = await this.client.resolver.infinite(qParams, [ this.client.resolver.resolveMember.bind(this.client.resolver), this.client.resolver.resolveUser.bind(this.client.resolver) diff --git a/structure/client/components/commands/moderation/Unlockdown.js b/structure/client/components/commands/moderation/Unlockdown.js index 5fb37c9..73a0693 100644 --- a/structure/client/components/commands/moderation/Unlockdown.js +++ b/structure/client/components/commands/moderation/Unlockdown.js @@ -23,7 +23,8 @@ class UnlockdownCommand extends Command { throttling: { usages: 2, duration: 10 - } + }, + archivable: false }); }