3 files changed, 5 insertions, 12 deletions
diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts
index d613217..7a021ed 100644
--- a/src/commands/moulberry-bush/capePerms.ts
+++ b/src/commands/moulberry-bush/capePerms.ts
@@ -1,5 +1,4 @@
 import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
-import { Constants } from 'discord-akairo';
 import { MessageEmbed } from 'discord.js';
 import got from 'got';
 
@@ -16,8 +15,7 @@ export default class CapePermissionsCommand extends BushCommand {
 			args: [
 				{
 					id: 'ign',
-					type: Constants.ArgumentTypes.STRING,
-					match: Constants.ArgumentMatches.PHRASE,
+					type: 'string',
 					prompt: {
 						start: 'Who would you like to see the cape permissions of?',
 						retry: '{error} Choose someone to see the capes their available capes.',
diff --git a/src/commands/moulberry-bush/report.ts b/src/commands/moulberry-bush/report.ts
index 4c6adc1..2ee02bd 100644
--- a/src/commands/moulberry-bush/report.ts
+++ b/src/commands/moulberry-bush/report.ts
@@ -1,4 +1,3 @@
-import { Constants } from 'discord-akairo';
 import { GuildMember, MessageEmbed, TextChannel } from 'discord.js';
 import moment from 'moment';
 import { AllowedMentions, BushCommand, BushMessage } from '../../lib';
@@ -16,8 +15,7 @@ export default class ReportCommand extends BushCommand {
 			args: [
 				{
 					id: 'member',
-					type: Constants.ArgumentTypes.MEMBER,
-					match: Constants.ArgumentMatches.PHRASE,
+					type: 'member',
 					prompt: {
 						start: 'Who would you like to report?',
 						retry: `{error} Choose a valid user to report.`,
@@ -26,8 +24,8 @@ export default class ReportCommand extends BushCommand {
 				},
 				{
 					id: 'evidence',
-					type: Constants.ArgumentTypes.STRING,
-					match: Constants.ArgumentMatches.REST,
+					type: 'string',
+					match: 'rest',
 					prompt: {
 						start: 'What evidence do you have?',
 						retry: `{error} Provide what did they do wrong.`,
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index 1681a1b..41dd8de 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -1,4 +1,3 @@
-import { Argument, Constants } from 'discord-akairo';
 import { MessageEmbed, User } from 'discord.js';
 import { AllowedMentions, BushCommand, BushMessage } from '../../lib';
 
@@ -65,8 +64,7 @@ export default class RuleCommand extends BushCommand {
 			args: [
 				{
 					id: 'rule',
-					type: Argument.range(Constants.ArgumentTypes.INTEGER, 1, rules.length, true),
-					match: Constants.ArgumentMatches.PHRASE,
+					customType: util.arg.range('integer', 1, rules.length, true),
 					prompt: {
 						start: 'What rule would you like to have cited?',
 						retry: '{error} Choose a valid rule.',
@@ -76,7 +74,6 @@ export default class RuleCommand extends BushCommand {
 				{
 					id: 'user',
 					type: 'user',
-					match: Constants.ArgumentMatches.PHRASE,
 					prompt: {
 						start: 'What user would you like to mention?',
 						retry: '{error} Choose a valid user to mention.',