remove global client variable

8 files changed, 25 insertions, 23 deletions

diff --git a/src/listeners/message/autoPublisher.ts b/src/listeners/message/autoPublisher.ts
index c669930..a6fb7e0 100644
--- a/src/listeners/message/autoPublisher.ts
+++ b/src/listeners/message/autoPublisher.ts
@@ -18,10 +18,11 @@ export default class autoPublisherListener extends BushListener {
 				await message
 					.crosspost()
 					.then(
-						() => void client.logger.log('autoPublisher', `Published message <<${message.id}>> in <<${message.guild!.name}>>.`)
+						() =>
+							void this.client.logger.log('autoPublisher', `Published message <<${message.id}>> in <<${message.guild!.name}>>.`)
 					)
 					.catch(() => {
-						void client.console.log('autoPublisher', `Failed to publish <<${message.id}>> in <<${message.guild!.name}>>.`);
+						void this.client.console.log('autoPublisher', `Failed to publish <<${message.id}>> in <<${message.guild!.name}>>.`);
 						void message.guild?.error('autoPublisher', `Unable to publish message id ${message.id} in <#${message.channel.id}>.`);
 					});
 			}
diff --git a/src/listeners/message/blacklistedFile.ts b/src/listeners/message/blacklistedFile.ts
index 15d97e3..3d66f38 100644
--- a/src/listeners/message/blacklistedFile.ts
+++ b/src/listeners/message/blacklistedFile.ts
@@ -122,7 +122,7 @@ export default class BlacklistedFileListener extends BushListener {
 		if (foundFiles.length > 0) {
 			try {
 				for (let i = 0; i < foundFiles.length; i++) {
-					if (foundFiles[i].name === 'Discord crash video' && !client.ownerID.includes(message.author.id)) {
+					if (foundFiles[i].name === 'Discord crash video' && !this.client.ownerID.includes(message.author.id)) {
 						await message.member?.roles.add('748912426581229690');
 					}
 				}
@@ -132,7 +132,7 @@ export default class BlacklistedFileListener extends BushListener {
 					`<@!${message.author.id}>, please do not send ${foundFiles.map((f) => f.description).join(' or ')}.`
 				);
 				if (message.channel.type === ChannelType.DM) return;
-				void client.console.info(
+				void this.client.console.info(
 					'blacklistedFile',
 					`Deleted <<${foundFiles.map((f) => f.description).join(' and ')}>> sent by <<${message.author.tag}>> in ${
 						message.channel.name
@@ -142,7 +142,7 @@ export default class BlacklistedFileListener extends BushListener {
 				void message.util!.send(
 					`<@!${message.author.id}>, please do not send ${foundFiles.map((f) => f.description).join(' or ')}.`
 				);
-				void client.console.warn(
+				void this.client.console.warn(
 					'blacklistedFile',
 					`Failed to delete <<${foundFiles.map((f) => f.description).join(' and ')}>> sent by <<${message.author.tag}>> in <<${
 						message.channel.type === ChannelType.DM ? `${message.channel.recipient?.tag}'s DMs` : message.channel.name
diff --git a/src/listeners/message/boosterMessage.ts b/src/listeners/message/boosterMessage.ts
index e33abfb..1a4d3c3 100644
--- a/src/listeners/message/boosterMessage.ts
+++ b/src/listeners/message/boosterMessage.ts
@@ -14,7 +14,7 @@ export default class BoosterMessageListener extends BushListener {
 		if (!message.guild || !(await message.guild?.hasFeature('boosterMessageReact'))) return;
 		if (message.type === MessageType.UserPremiumGuildSubscription) {
 			return await message.react('<:nitroboost:785160348885975062>').catch(() => {
-				void client.console.warn('boosterMessage', `Failed to react to <<${message.id}>>.`);
+				void this.client.console.warn('boosterMessage', `Failed to react to <<${message.id}>>.`);
 			});
 		}
 	}
diff --git a/src/listeners/message/directMessage.ts b/src/listeners/message/directMessage.ts
index 463e4d8..7b599d9 100644
--- a/src/listeners/message/directMessage.ts
+++ b/src/listeners/message/directMessage.ts
@@ -1,4 +1,4 @@
-import { BushListener, colors, getConfigChannel, type BushClientEvents } from '#lib';
+import { BushListener, colors, type BushClientEvents } from '#lib';
 import { ChannelType, EmbedBuilder } from 'discord.js';
 
 export default class DirectMessageListener extends BushListener {
@@ -12,11 +12,11 @@ export default class DirectMessageListener extends BushListener {
 
 	public async exec(...[message]: BushClientEvents['messageCreate']) {
 		if (message.channel.type === ChannelType.DM) {
-			if (!(message.author.id == client.user!.id) && message.author.bot) return;
-			if (client.cache.global.blacklistedUsers.includes(message.author.id)) return;
+			if (!(message.author.id == this.client.user!.id) && message.author.bot) return;
+			if (this.client.cache.global.blacklistedUsers.includes(message.author.id)) return;
 			const dmLogEmbed = new EmbedBuilder().setTimestamp().setFooter({ text: `User ID • ${message.channel.recipientId}` });
 
-			if (message.author.id != client.user!.id) {
+			if (message.author.id != this.client.user!.id) {
 				dmLogEmbed
 					.setAuthor({
 						name: `From: ${message.author.username}`,
@@ -39,7 +39,7 @@ export default class DirectMessageListener extends BushListener {
 			} else if (message.attachments.size > 0) {
 				dmLogEmbed.addFields([{ name: 'Attachments', value: message.attachments.map((a) => a.proxyURL).join('\n') }]);
 			}
-			const dmChannel = await getConfigChannel('dm');
+			const dmChannel = await this.client.utils.getConfigChannel('dm');
 			await dmChannel.send({ embeds: [dmLogEmbed] });
 		}
 	}
diff --git a/src/listeners/message/highlight.ts b/src/listeners/message/highlight.ts
index d68337c..d9d3c0b 100644
--- a/src/listeners/message/highlight.ts
+++ b/src/listeners/message/highlight.ts
@@ -14,12 +14,12 @@ export default class HighlightListener extends BushListener {
 		if (message.author.bot || message.system) return;
 		if (!(await message.guild.hasFeature('highlight'))) return; // allows highlighting to be disabled on a guild-by-guild basis
 
-		client.highlightManager.updateLastTalked(message);
-		const res = client.highlightManager.checkMessage(message);
+		this.client.highlightManager.updateLastTalked(message);
+		const res = this.client.highlightManager.checkMessage(message);
 
 		for (const [user, hl] of res.entries()) {
 			if (message.author.id === user) continue;
-			void client.highlightManager.notify(message, user, hl);
+			void this.client.highlightManager.notify(message, user, hl);
 		}
 	}
 }
diff --git a/src/listeners/message/level.ts b/src/listeners/message/level.ts
index a72ae02..526dac9 100644
--- a/src/listeners/message/level.ts
+++ b/src/listeners/message/level.ts
@@ -1,4 +1,4 @@
-import { BushListener, handleError, Level, type BushCommandHandlerEvents } from '#lib';
+import { BushListener, Level, type BushCommandHandlerEvents } from '#lib';
 import { MessageType } from 'discord.js';
 
 export default class LevelListener extends BushListener {
@@ -33,13 +33,14 @@ export default class LevelListener extends BushListener {
 		const xpToGive = Level.genRandomizedXp();
 		user.xp = user.xp + xpToGive;
 		const success = await user.save().catch((e) => {
-			void handleError('level', e);
+			void this.client.utils.handleError('level', e);
 			return false;
 		});
 		const newLevel = Level.convertXpToLevel(user.xp);
-		if (previousLevel !== newLevel) client.emit('bushLevelUpdate', message.member!, previousLevel, newLevel, user.xp, message);
+		if (previousLevel !== newLevel)
+			this.client.emit('bushLevelUpdate', message.member!, previousLevel, newLevel, user.xp, message);
 		if (success)
-			void client.logger.verbose(`level`, `Gave <<${xpToGive}>> XP to <<${message.author.tag}>> in <<${message.guild}>>.`);
+			void this.client.logger.verbose(`level`, `Gave <<${xpToGive}>> XP to <<${message.author.tag}>> in <<${message.guild}>>.`);
 		this.#levelCooldowns.add(`${message.guildId}-${message.author.id}`);
 		setTimeout(() => this.#levelCooldowns.delete(`${message.guildId}-${message.author.id}`), 60_000);
 	}
diff --git a/src/listeners/message/quoteCreate.ts b/src/listeners/message/quoteCreate.ts
index d43eef7..0478bcf 100644
--- a/src/listeners/message/quoteCreate.ts
+++ b/src/listeners/message/quoteCreate.ts
@@ -1,4 +1,4 @@
-import { BushListener, resolveMessagesFromLinks, type BushClientEvents } from '#lib';
+import { BushListener, type BushClientEvents } from '#lib';
 
 export default class QuoteCreateListener extends BushListener {
 	public constructor() {
@@ -10,10 +10,10 @@ export default class QuoteCreateListener extends BushListener {
 	}
 
 	public async exec(...[message]: BushClientEvents['messageCreate']) {
-		if (message.author.id !== '322862723090219008' || !client.config.isProduction) return;
+		if (message.author.id !== '322862723090219008' || !this.client.config.isProduction) return;
 		if (!message.inGuild()) return;
 
-		const messages = await resolveMessagesFromLinks(message.content);
+		const messages = await this.client.utils.resolveMessagesFromLinks(message.content);
 		if (!messages.length) return;
 
 		for (const msg of messages) {
diff --git a/src/listeners/message/verbose.ts b/src/listeners/message/verbose.ts
index e3ef04f..f5e94de 100644
--- a/src/listeners/message/verbose.ts
+++ b/src/listeners/message/verbose.ts
@@ -11,9 +11,9 @@ export default class MessageVerboseListener extends BushListener {
 	}
 
 	public exec(...[message]: BushClientEvents['messageCreate']): void {
-		if (client.customReady) {
+		if (this.client.customReady) {
 			if (message.channel?.type === ChannelType.DM) return;
-			void client.console.verbose(
+			void this.client.console.verbose(
 				'messageVerbose',
 				`A message was sent by <<${message.author.tag}>> in <<${message.channel.name}>> in <<${message.guild!.name}>>.`
 			);