resolved conflicts and stuff

4 files changed, 12 insertions, 10 deletions

diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts
index 66bf5af..406ea2d 100644
--- a/src/commands/info/botInfo.ts
+++ b/src/commands/info/botInfo.ts
@@ -12,7 +12,8 @@ export default class BotInfoCommand extends BushCommand {
 				content: 'Shows information about the bot',
 				usage: 'botinfo',
 				examples: ['botinfo']
-			}
+			},
+			slash: true
 		});
 	}
 
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index 8dac8ee..e7998a4 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -1,5 +1,4 @@
 import { stripIndent } from 'common-tags';
-import { ApplicationCommandOptionType } from 'discord-api-types';
 import { Message, MessageEmbed } from 'discord.js';
 import { SlashCommandOption } from '../../lib/extensions/BushClientUtil';
 import { BushCommand } from '../../lib/extensions/BushCommand';
@@ -22,14 +21,15 @@ export default class HelpCommand extends BushCommand {
 					type: 'commandAlias'
 				}
 			],
-			slashCommandOptions: [
+			slashOptions: [
 				{
-					type: ApplicationCommandOptionType.STRING,
+					type: 'STRING',
 					name: 'command',
 					description: 'The command to get help for',
 					required: false
 				}
-			]
+			],
+			slash: true
 		});
 	}
 
diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
index f0d017e..f0b4a2f 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/ping.ts
@@ -11,7 +11,8 @@ export default class PingCommand extends BushCommand {
 				content: 'Gets the latency of the bot',
 				usage: 'ping',
 				examples: ['ping']
-			}
+			},
+			slash: true
 		});
 	}
 
diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts
index bade100..83aa5ca 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronouns.ts
@@ -1,4 +1,3 @@
-import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction, Message, MessageEmbed, User } from 'discord.js';
 import got, { HTTPError } from 'got';
 import { SlashCommandOption } from '../../lib/extensions/BushClientUtil';
@@ -48,15 +47,16 @@ export default class PronounsCommand extends BushCommand {
 				}
 			],
 			clientPermissions: ['SEND_MESSAGES'],
-			slashCommandOptions: [
+			slashOptions: [
 				{
-					type: ApplicationCommandOptionType.USER,
+					type: 'USER',
 					name: 'user',
 					description: 'The user to get pronouns for',
 					required: false
 				}
 			],
-			slashEphemeral: true // I'll add dynamic checking to this later
+			slashEphemeral: true, // I'll add dynamic checking to this later
+			slash: true
 		});
 	}
 	async sendResponse(message: Message | CommandInteraction, user: User, author: boolean): Promise<void> {