aboutsummaryrefslogtreecommitdiff
path: root/src/commands/moderation
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-06-19 16:52:09 -0400
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-06-19 16:52:09 -0400
commitf2883f221706f86ee045fa94ad8cd3c9b5db5f97 (patch)
treecd3613ef478eb5306b474fa3a5871de9c985d81b /src/commands/moderation
parentea64ebfff9aae32deb036643422d3427959dcd24 (diff)
parent0c24fcffe34653564aaaf8a3cb124d6a3f6f4a42 (diff)
downloadtanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.tar.gz
tanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.tar.bz2
tanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.zip
resolved conflicts and stuff
Diffstat (limited to 'src/commands/moderation')
-rw-r--r--src/commands/moderation/ban.ts12
-rw-r--r--src/commands/moderation/kick.ts10
2 files changed, 11 insertions, 11 deletions
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 4847d19..a493071 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -1,4 +1,3 @@
-import { ApplicationCommandOptionType } from 'discord-api-types';
import { CommandInteraction, Message, User } from 'discord.js';
import moment from 'moment';
import { SlashCommandOption } from '../../lib/extensions/BushClientUtil';
@@ -46,26 +45,27 @@ export default class BanCommand extends BushCommand {
usage: 'ban <member> <reason> [--time]',
examples: ['ban @Tyman being cool', 'ban @Tyman being cool --time 7days']
},
- slashCommandOptions: [
+ slashOptions: [
{
- type: ApplicationCommandOptionType.USER,
+ type: 'USER',
name: 'user',
description: 'The user to ban',
required: true
},
{
- type: ApplicationCommandOptionType.STRING,
+ type: 'STRING',
name: 'reason',
description: 'The reason to show in modlogs and audit log',
required: false
},
{
- type: ApplicationCommandOptionType.STRING,
+ type: 'STRING',
name: 'time',
description: 'The time the user should be banned for (default permanent)',
required: false
}
- ]
+ ],
+ slash: true
});
}
async *genResponses(
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
index 7bd53e0..b97fe91 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -1,4 +1,3 @@
-import { ApplicationCommandOptionType } from 'discord-api-types';
import { CommandInteraction, GuildMember, Message } from 'discord.js';
import { BushCommand } from '../../lib/extensions/BushCommand';
import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage';
@@ -29,20 +28,21 @@ export default class KickCommand extends BushCommand {
usage: 'kick <member> <reason>',
examples: ['kick @Tyman being cool']
},
- slashCommandOptions: [
+ slashOptions: [
{
- type: ApplicationCommandOptionType.USER,
+ type: 'USER',
name: 'user',
description: 'The user to kick',
required: true
},
{
- type: ApplicationCommandOptionType.STRING,
+ type: 'STRING',
name: 'reason',
description: 'The reason to show in modlogs and audit log',
required: false
}
- ]
+ ],
+ slash: true
});
}