a few small changes

4 files changed, 38 insertions, 92 deletions

diff --git a/src/commands/leveling/leaderboard.ts b/src/commands/leveling/leaderboard.ts
index 19387f9..7e6eefd 100644
--- a/src/commands/leveling/leaderboard.ts
+++ b/src/commands/leveling/leaderboard.ts
@@ -6,31 +6,21 @@ export default class LeaderboardCommand extends BushCommand {
 		super('leaderboard', {
 			aliases: ['leaderboard', 'lb'],
 			category: 'leveling',
-			description: {
-				content: 'Allows you to see the users with the highest levels in the server.',
-				usage: ['leaderboard [page]'],
-				examples: ['leaderboard 5']
-			},
+			description: 'View the users with the highest levels in the server.',
+			usage: ['leaderboard [page]'],
+			examples: ['leaderboard 5'],
 			args: [
 				{
 					id: 'page',
+					description: 'The page of the leaderboard to view.',
 					type: 'integer',
-					prompt: {
-						start: 'What would you like to set your first argument to be?',
-						retry: '{error} Pick a valid argument.',
-						optional: true
-					}
+					prompt: 'What page of the leaderboard would you like to view?',
+					retry: '{error} Pick a valid argument.',
+					optional: true,
+					slashType: 'INTEGER',
 				}
 			],
 			slash: true,
-			slashOptions: [
-				{
-					name: 'page',
-					description: 'What would you like to set your first argument to be?',
-					type: 'INTEGER',
-					required: false
-				}
-			],
 			channel: 'guild',
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: []
diff --git a/src/commands/leveling/level.ts b/src/commands/leveling/level.ts
index 36fb153..61e5d0b 100644
--- a/src/commands/leveling/level.ts
+++ b/src/commands/leveling/level.ts
@@ -20,31 +20,21 @@ export default class LevelCommand extends BushCommand {
 		super('level', {
 			aliases: ['level', 'rank', 'lvl'],
 			category: 'leveling',
-			description: {
-				content: 'Shows the level of a user',
-				usage: ['level [user]'],
-				examples: ['level', 'level @Tyman']
-			},
+			description: 'Shows the level of a user',
+			usage: ['level [user]'],
+			examples: ['level', 'level @Tyman'],
 			args: [
 				{
 					id: 'user',
+					description: 'The user to get the level of.',
 					type: 'user',
-					prompt: {
-						start: 'What user would you like to see the level of?',
-						retry: '{error} Choose a valid user to see the level of.',
-						optional: true
-					}
+					prompt: 'What user would you like to see the level of?',
+					retry: '{error} Choose a valid user to see the level of.',
+					optional: true,
+					slashType: 'USER'
 				}
 			],
 			slash: true,
-			slashOptions: [
-				{
-					name: 'user',
-					description: 'The user to get the level of',
-					type: 'USER',
-					required: false
-				}
-			],
 			channel: 'guild',
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: []
diff --git a/src/commands/leveling/setLevel.ts b/src/commands/leveling/setLevel.ts
index 499463a..69f562d 100644
--- a/src/commands/leveling/setLevel.ts
+++ b/src/commands/leveling/setLevel.ts
@@ -6,41 +6,25 @@ export default class SetLevelCommand extends BushCommand {
 		super('setLevel', {
 			aliases: ['set-level'],
 			category: 'leveling',
-			description: {
-				content: 'Sets the level of a user',
-				usage: ['set-level <user> <level>'],
-				examples: ['set-level @Moulberry 69'] //nice
-			},
+			description: 'Sets the level of a user',
+			usage: ['set-level <user> <level>'],
+			examples: ['set-level @Moulberry 69'], //nice
 			args: [
 				{
 					id: 'user',
+					description: 'The user to set the level of.',
 					type: 'user',
-					prompt: {
-						start: 'What user would you like to change the level of?',
-						retry: '{error} Choose a valid user to change the level of.'
-					}
+					prompt: 'What user would you like to change the level of?',
+					retry: '{error} Choose a valid user to change the level of.',
+					slashType: 'USER'
 				},
 				{
 					id: 'level',
+					description: 'The level to set the user to.',
 					type: 'integer',
-					prompt: {
-						start: 'What level would you like to set the user to?',
-						retry: '{error} Choose a valid level to set the user to.'
-					}
-				}
-			],
-			slashOptions: [
-				{
-					name: 'user',
-					description: 'What user would you like to change the level of?',
-					type: 'USER',
-					required: true
-				},
-				{
-					name: 'level',
-					description: 'What level would you like to set the user to?',
-					type: 'INTEGER',
-					required: true
+					prompt: 'What level would you like to set the user to?',
+					retry: '{error} Choose a valid level to set the user to.',
+					slashType: 'INTEGER'
 				}
 			],
 			slash: true,
diff --git a/src/commands/leveling/setXp.ts b/src/commands/leveling/setXp.ts
index 2f2a6fa..68be528 100644
--- a/src/commands/leveling/setXp.ts
+++ b/src/commands/leveling/setXp.ts
@@ -6,44 +6,26 @@ export default class SetXpCommand extends BushCommand {
 		super('setXp', {
 			aliases: ['set-xp'],
 			category: 'leveling',
-			description: {
-				content: 'Sets the xp of a user',
-				usage: ['set-xp <user> <xp>'],
-				examples: ['set-xp @Moulberry 69k'] //nice
-			},
+			description: 'Sets the xp of a user',
+			usage: ['set-xp <user> <xp>'],
+			examples: ['set-xp @Moulberry 69k'], //nice
 			args: [
 				{
 					id: 'user',
+					description: 'The user to set the xp of.',
 					type: 'user',
-					prompt: {
-						start: 'What user would you like to change the xp of?',
-						retry: '{error} Choose a valid user to change the xp of.',
-						required: true
-					}
+					prompt: 'What user would you like to change the xp of?',
+					retry: '{error} Choose a valid user to change the xp of.',
+					slashType: 'USER'
 				},
 				{
 					id: 'xp',
+					description: 'The xp to set the user to.',
 					type: 'abbreviatedNumber',
 					match: 'restContent',
-					prompt: {
-						start: 'How much xp should the user have?',
-						retry: "{error} Choose a valid number to set the user's xp to.",
-						required: true
-					}
-				}
-			],
-			slashOptions: [
-				{
-					name: 'user',
-					description: 'What user would you like to change the xp of?',
-					type: 'USER',
-					required: true
-				},
-				{
-					name: 'xp',
-					description: 'How much xp should the user have?',
-					type: 'INTEGER',
-					required: true
+					prompt: 'How much xp should the user have?',
+					retry: "{error} Choose a valid number to set the user's xp to.",
+					slashType: 'INTEGER'
 				}
 			],
 			slash: true,