general clean up and fix automod

4 files changed, 8 insertions, 12 deletions

diff --git a/src/commands/dev/__template.ts b/src/commands/dev/__template.ts
index 1e65457..35c57db 100644
--- a/src/commands/dev/__template.ts
+++ b/src/commands/dev/__template.ts
@@ -14,7 +14,7 @@ export default class TemplateCommand extends BushCommand {
 				{
 					id: 'required_argument',
 					type: 'string',
-					match: 'phrase',
+
 					prompt: {
 						start: 'What would you like to set your first argument to be?',
 						retry: '{error} Pick a valid argument.',
@@ -24,7 +24,7 @@ export default class TemplateCommand extends BushCommand {
 				{
 					id: 'optional_argument',
 					type: 'string',
-					match: 'phrase',
+
 					prompt: {
 						start: 'What would you like to set your second argument to be?',
 						retry: '{error} Pick a valid argument.',
diff --git a/src/commands/dev/sh.ts b/src/commands/dev/sh.ts
index ed1dfd7..b8c8379 100644
--- a/src/commands/dev/sh.ts
+++ b/src/commands/dev/sh.ts
@@ -1,7 +1,6 @@
 import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import chalk from 'chalk';
 import { exec } from 'child_process';
-import { Constants } from 'discord-akairo';
 import { MessageEmbed, Util } from 'discord.js';
 import { promisify } from 'util';
 
@@ -25,8 +24,8 @@ export default class ShCommand extends BushCommand {
 			args: [
 				{
 					id: 'command',
-					type: Constants.ArgumentTypes.STRING,
-					match: Constants.ArgumentMatches.REST,
+					type: 'string',
+					match: 'rest',
 					prompt: {
 						start: 'What would you like run',
 						retry: '{error} Invalid command to run.'
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts
index 9071a8d..eade861 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -1,5 +1,4 @@
 import { BushCommand, BushMessage, BushSlashMessage, Global } from '@lib';
-import { Constants } from 'discord-akairo';
 import { User } from 'discord.js';
 
 export default class SuperUserCommand extends BushCommand {
@@ -20,7 +19,6 @@ export default class SuperUserCommand extends BushCommand {
 		const action = yield {
 			id: 'action',
 			type: ['add', 'remove'],
-			match: Constants.ArgumentMatches.PHRASE,
 			prompt: {
 				start: 'Would you like to `add` or `remove` a user from the superuser list?',
 				retry: '{error} Choose if you would like to `add` or `remove` a user.',
@@ -29,8 +27,8 @@ export default class SuperUserCommand extends BushCommand {
 		};
 		const user = yield {
 			id: 'user',
-			type: Constants.ArgumentTypes.USER,
-			match: Constants.ArgumentMatches.REST_CONTENT,
+			type: 'user',
+			match: 'restContent',
 			prompt: {
 				start: `Who would you like to ${action || 'add/remove'} from the superuser list?`,
 				retry: `Choose a valid user to ${action || 'add/remove'} from the superuser list.`,
diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts
index 3a27be0..6b49dce 100644
--- a/src/commands/dev/test.ts
+++ b/src/commands/dev/test.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { BushCommand, BushMessage } from '@lib';
-import { Constants } from 'discord-akairo';
 import { Constants as jsConstants, MessageActionRow, MessageButton, MessageEmbed } from 'discord.js';
 
 export default class TestCommand extends BushCommand {
@@ -18,8 +17,8 @@ export default class TestCommand extends BushCommand {
 			args: [
 				{
 					id: 'feature',
-					type: Constants.ArgumentTypes.STRING,
-					match: Constants.ArgumentMatches.REST,
+					type: 'string',
+					match: 'rest',
 					prompt: {
 						start: 'start prompt',
 						retry: 'retry prompt',