remove util classes, move config out of src

1 files changed, 25 insertions, 14 deletions

diff --git a/src/commands/config/disable.ts b/src/commands/config/disable.ts
index 373b5f6..4f52b7c 100644
--- a/src/commands/config/disable.ts
+++ b/src/commands/config/disable.ts
@@ -1,4 +1,16 @@
-import { AllowedMentions, BushCommand, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
+import {
+	addOrRemoveFromArray,
+	AllowedMentions,
+	Arg,
+	BushCommand,
+	clientSendAndPermCheck,
+	emojis,
+	getGlobal,
+	setGlobal,
+	type ArgType,
+	type CommandMessage,
+	type SlashMessage
+} from '#lib';
 import assert from 'assert';
 import { ApplicationCommandOptionType, AutocompleteInteraction, PermissionFlagsBits } from 'discord.js';
 import Fuse from 'fuse.js';
@@ -28,7 +40,7 @@ export default class DisableCommand extends BushCommand {
 				{
 					id: 'command',
 					description: 'The command to disable/enable.',
-					type: util.arg.union('commandAlias', 'command'),
+					type: Arg.union('commandAlias', 'command'),
 					readableType: 'command|commandAlias',
 					prompt: 'What command would you like to enable/disable?',
 					retry: '{error} Pick a valid command.',
@@ -48,7 +60,7 @@ export default class DisableCommand extends BushCommand {
 			],
 			slash: true,
 			channel: 'guild',
-			clientPermissions: (m) => util.clientSendAndPermCheck(m),
+			clientPermissions: (m) => clientSendAndPermCheck(m),
 			userPermissions: [PermissionFlagsBits.ManageGuild]
 		});
 	}
@@ -62,23 +74,23 @@ export default class DisableCommand extends BushCommand {
 		let action = (args.action ?? message.util?.parsed?.alias ?? 'toggle') as 'disable' | 'enable' | 'toggle';
 		const global = args.global && message.author.isOwner();
 		const commandID =
-			args.command instanceof BushCommand ? args.command.id : (await util.arg.cast('commandAlias', message, args.command))?.id;
+			args.command instanceof BushCommand ? args.command.id : (await Arg.cast('commandAlias', message, args.command))?.id;
 
-		if (!commandID) return await message.util.reply(`${util.emojis.error} Invalid command.`);
+		if (!commandID) return await message.util.reply(`${emojis.error} Invalid command.`);
 
 		if (DisableCommand.blacklistedCommands.includes(commandID))
-			return message.util.send(`${util.emojis.error} the ${commandID} command cannot be disabled.`);
+			return message.util.send(`${emojis.error} the ${commandID} command cannot be disabled.`);
 
-		const disabledCommands = global ? util.getGlobal('disabledCommands') : await message.guild.getSetting('disabledCommands');
+		const disabledCommands = global ? getGlobal('disabledCommands') : await message.guild.getSetting('disabledCommands');
 
 		if (action === 'toggle') action = disabledCommands.includes(commandID) ? 'disable' : 'enable';
-		const newValue = util.addOrRemoveFromArray(action === 'disable' ? 'add' : 'remove', disabledCommands, commandID);
+		const newValue = addOrRemoveFromArray(action === 'disable' ? 'add' : 'remove', disabledCommands, commandID);
 		const success = global
-			? await util.setGlobal('disabledCommands', newValue).catch(() => false)
+			? await setGlobal('disabledCommands', newValue).catch(() => false)
 			: await message.guild.setSetting('disabledCommands', newValue, message.member!).catch(() => false);
 		if (!success)
 			return await message.util.reply({
-				content: `${util.emojis.error} There was an error${global ? ' globally' : ''} **${action.substring(
+				content: `${emojis.error} There was an error${global ? ' globally' : ''} **${action.substring(
 					0,
 					action.length - 2
 				)}ing** the **${commandID}** command.`,
@@ -86,10 +98,9 @@ export default class DisableCommand extends BushCommand {
 			});
 		else
 			return await message.util.reply({
-				content: `${util.emojis.success} Successfully **${action.substring(
-					0,
-					action.length - 2
-				)}ed** the **${commandID}** command${global ? ' globally' : ''}.`,
+				content: `${emojis.success} Successfully **${action.substring(0, action.length - 2)}ed** the **${commandID}** command${
+					global ? ' globally' : ''
+				}.`,
 				allowedMentions: AllowedMentions.none()
 			});
 	}