remove util classes, move config out of src

6 files changed, 33 insertions, 35 deletions

diff --git a/src/listeners/guild/guildCreate.ts b/src/listeners/guild/guildCreate.ts
index 56cd5df..fe23979 100644
--- a/src/listeners/guild/guildCreate.ts
+++ b/src/listeners/guild/guildCreate.ts
@@ -1,4 +1,4 @@
-import { BushListener, Guild, type BushClientEvents } from '#lib';
+import { BushListener, colors, emojis, format, getConfigChannel, Guild, type BushClientEvents } from '#lib';
 
 export default class GuildCreateListener extends BushListener {
 	public constructor() {
@@ -9,18 +9,18 @@ export default class GuildCreateListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[guild]: BushClientEvents['guildCreate']) {
+	public async exec(...[guild]: BushClientEvents['guildCreate']) {
 		void client.console.info('guildCreate', `Joined <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`);
 		const g = await Guild.findByPk(guild.id);
 		if (!g) void Guild.create({ id: guild.id });
 
-		const channel = await util.getConfigChannel('servers');
+		const channel = await getConfigChannel('servers');
 		if (!channel) return;
 		return await channel.send({
 			embeds: [
 				{
-					color: util.colors.Green,
-					description: `${util.emojis.join} Joined ${util.format.input(
+					color: colors.Green,
+					description: `${emojis.join} Joined ${format.input(
 						guild.name
 					)} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`,
 					timestamp: new Date().toISOString(),
diff --git a/src/listeners/guild/guildDelete.ts b/src/listeners/guild/guildDelete.ts
index 054c5e0..5efbe9b 100644
--- a/src/listeners/guild/guildDelete.ts
+++ b/src/listeners/guild/guildDelete.ts
@@ -1,4 +1,4 @@
-import { BushListener, type BushClientEvents } from '#lib';
+import { BushListener, colors, emojis, format, getConfigChannel, type BushClientEvents } from '#lib';
 
 export default class GuildDeleteListener extends BushListener {
 	public constructor() {
@@ -9,16 +9,16 @@ export default class GuildDeleteListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[guild]: BushClientEvents['guildDelete']) {
+	public async exec(...[guild]: BushClientEvents['guildDelete']) {
 		void client.console.info('guildDelete', `Left <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`);
 
-		const channel = await util.getConfigChannel('servers');
+		const channel = await getConfigChannel('servers');
 		if (!channel) return;
 		return await channel.send({
 			embeds: [
 				{
-					color: util.colors.Red,
-					description: `${util.emojis.leave} Left ${util.format.input(
+					color: colors.Red,
+					description: `${emojis.leave} Left ${format.input(
 						guild.name
 					)} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`,
 					timestamp: new Date().toISOString(),
diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts
index de1f859..004a2c2 100644
--- a/src/listeners/guild/guildMemberAdd.ts
+++ b/src/listeners/guild/guildMemberAdd.ts
@@ -1,4 +1,4 @@
-import { BushListener, type BushClientEvents } from '#lib';
+import { BushListener, colors, emojis, format, type BushClientEvents } from '#lib';
 import { EmbedBuilder, type GuildMember, type TextChannel } from 'discord.js';
 
 export default class GuildMemberAddListener extends BushListener {
@@ -10,7 +10,7 @@ export default class GuildMemberAddListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[member]: BushClientEvents['guildMemberAdd']) {
+	public async exec(...[member]: BushClientEvents['guildMemberAdd']) {
 		void this.sendWelcomeMessage(member);
 	}
 
@@ -30,24 +30,24 @@ export default class GuildMemberAddListener extends BushListener {
 
 		const embed = new EmbedBuilder()
 			.setDescription(
-				`${util.emojis.join} ${util.format.input(
+				`${emojis.join} ${format.input(
 					member.user.tag
 				)} joined the server. There are now ${member.guild.memberCount.toLocaleString()} members.`
 			)
-			.setColor(util.colors.green);
+			.setColor(colors.green);
 
 		await welcome
 			.send({ embeds: [embed] })
 			.then(() =>
 				client.console.info(
 					'guildMemberAdd',
-					`Sent a message for ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
+					`Sent a message for ${format.inputLog(member.user.tag)} in ${format.inputLog(member.guild.name)}.`
 				)
 			)
 			.catch(() =>
 				welcome.guild.error(
 					'Welcome Message',
-					`Failed to send message for ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
+					`Failed to send message for ${format.inputLog(member.user.tag)} in ${format.inputLog(member.guild.name)}.`
 				)
 			);
 	}
diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts
index 59f8800..80e9ee8 100644
--- a/src/listeners/guild/guildMemberRemove.ts
+++ b/src/listeners/guild/guildMemberRemove.ts
@@ -1,4 +1,4 @@
-import { BushListener, StickyRole, Time, type BushClientEvents } from '#lib';
+import { BushListener, colors, emojis, format, sleep, StickyRole, Time, type BushClientEvents } from '#lib';
 import { EmbedBuilder, type GuildMember, type PartialGuildMember, type TextChannel } from 'discord.js';
 
 export default class GuildMemberRemoveListener extends BushListener {
@@ -10,7 +10,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[member]: BushClientEvents['guildMemberRemove']) {
+	public async exec(...[member]: BushClientEvents['guildMemberRemove']) {
 		void this.sendWelcomeMessage(member);
 		void this.stickyRoles(member);
 	}
@@ -18,7 +18,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 	private async sendWelcomeMessage(member: GuildMember | PartialGuildMember) {
 		if (client.config.isDevelopment) return;
 		const user = member.partial ? await client.users.fetch(member.id) : member.user;
-		await util.sleep(50 * Time.Millisecond); // ban usually triggers after member leave
+		await sleep(50 * Time.Millisecond); // ban usually triggers after member leave
 		const isBan = member.guild.bans.cache.has(member.id);
 		const welcomeChannel = await member.guild.getSetting('welcomeChannel');
 		if (!welcomeChannel) return;
@@ -26,23 +26,23 @@ export default class GuildMemberRemoveListener extends BushListener {
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
 		const embed: EmbedBuilder = new EmbedBuilder()
 			.setDescription(
-				`${util.emojis.leave} ${util.format.input(user.tag)} ${
+				`${emojis.leave} ${format.input(user.tag)} ${
 					isBan ? 'got banned from' : 'left'
 				} the server. There are now ${welcome.guild.memberCount.toLocaleString()} members.`
 			)
-			.setColor(isBan ? util.colors.orange : util.colors.red);
+			.setColor(isBan ? colors.orange : colors.red);
 		welcome
 			.send({ embeds: [embed] })
 			.then(() =>
 				client.console.info(
 					'guildMemberRemove',
-					`Sent a message for ${util.format.inputLog(user.tag)} in ${util.format.inputLog(member.guild.name)}.`
+					`Sent a message for ${format.inputLog(user.tag)} in ${format.inputLog(member.guild.name)}.`
 				)
 			)
 			.catch(() =>
 				member.guild.error(
 					'Welcome Message Error',
-					`Failed to send message for ${util.format.input(user.tag)} in ${util.format.input(member.guild.name)}.`
+					`Failed to send message for ${format.input(user.tag)} in ${format.input(member.guild.name)}.`
 				)
 			);
 	}
@@ -74,7 +74,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 				.then(() =>
 					client.console.info(
 						'guildMemberRemove',
-						`${isNew ? 'Created' : 'Updated'} info for ${util.format.inputLog(member.user.tag)}.`
+						`${isNew ? 'Created' : 'Updated'} info for ${format.inputLog(member.user.tag)}.`
 					)
 				);
 		}
diff --git a/src/listeners/guild/joinRoles.ts b/src/listeners/guild/joinRoles.ts
index dab623f..f2922c8 100644
--- a/src/listeners/guild/joinRoles.ts
+++ b/src/listeners/guild/joinRoles.ts
@@ -1,4 +1,4 @@
-import { BushListener, StickyRole, type BushClientEvents } from '#lib';
+import { BushListener, colors, format, StickyRole, type BushClientEvents } from '#lib';
 import { type GuildMember, type Snowflake } from 'discord.js';
 
 export default class JoinRolesListener extends BushListener {
@@ -10,7 +10,7 @@ export default class JoinRolesListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[oldMember, newMember]: BushClientEvents['guildMemberUpdate']) {
+	public async exec(...[oldMember, newMember]: BushClientEvents['guildMemberUpdate']) {
 		if (client.config.isDevelopment) return;
 		if (oldMember.pending && !newMember.pending) {
 			const feat = {
@@ -58,8 +58,8 @@ export default class JoinRolesListener extends BushListener {
 						embeds: [
 							{
 								title: 'Sticky Roles Error',
-								description: `There was an error returning ${util.format.input(member.user.tag)}'s roles.`,
-								color: util.colors.error
+								description: `There was an error returning ${format.input(member.user.tag)}'s roles.`,
+								color: colors.error
 							}
 						]
 					});
@@ -68,7 +68,7 @@ export default class JoinRolesListener extends BushListener {
 				if (addedRoles) {
 					void client.console.info(
 						'guildMemberAdd',
-						`Assigned sticky roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
+						`Assigned sticky roles to ${format.inputLog(member.user.tag)} in ${format.inputLog(member.guild.name)}.`
 					);
 				} else if (!addedRoles) {
 					const failedRoles: string[] = [];
@@ -82,9 +82,7 @@ export default class JoinRolesListener extends BushListener {
 					} else {
 						void client.console.info(
 							'guildMemberAdd',
-							`[Fallback] Assigned sticky roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(
-								member.guild.name
-							)}.`
+							`[Fallback] Assigned sticky roles to ${format.inputLog(member.user.tag)} in ${format.inputLog(member.guild.name)}.`
 						);
 					}
 				}
@@ -106,13 +104,13 @@ export default class JoinRolesListener extends BushListener {
 			.then(() =>
 				client.console.info(
 					'guildMemberAdd',
-					`Assigned join roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
+					`Assigned join roles to ${format.inputLog(member.user.tag)} in ${format.inputLog(member.guild.name)}.`
 				)
 			)
 			.catch(() =>
 				member.guild.error(
 					'Join Roles Error',
-					`Failed to assign join roles to ${util.format.input(member.user.tag)}, in ${util.format.input(member.guild.name)}.`
+					`Failed to assign join roles to ${format.input(member.user.tag)}, in ${format.input(member.guild.name)}.`
 				)
 			);
 	}
diff --git a/src/listeners/guild/syncUnbanPunishmentModel.ts b/src/listeners/guild/syncUnbanPunishmentModel.ts
index 44f5bb4..80a8ce2 100644
--- a/src/listeners/guild/syncUnbanPunishmentModel.ts
+++ b/src/listeners/guild/syncUnbanPunishmentModel.ts
@@ -9,7 +9,7 @@ export default class SyncUnbanListener extends BushListener {
 		});
 	}
 
-	public override async exec(...[ban]: BushClientEvents['guildBanRemove']) {
+	public async exec(...[ban]: BushClientEvents['guildBanRemove']) {
 		const bans = await ActivePunishment.findAll({
 			where: {
 				user: ban.user.id,