fix: refactored eval, sanitize decode, refactor price and fix trying to use an emoji as a color

3 files changed, 50 insertions, 6 deletions

diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 8599e76..c283eb9 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -261,7 +261,9 @@ export class BushClient extends AkairoClient {
 
 	/** Starts the bot */
 	public async start(): Promise<void> {
-		global.client = this; // makes the client a global object
+		// global objects
+		global.client = this;
+		global.util = this.util;
 
 		try {
 			await this._init();
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 1ba94c2..e8fe7fa 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -38,7 +38,7 @@ import {
 } from 'discord.js';
 import got from 'got';
 import humanizeDuration from 'humanize-duration';
-import { promisify } from 'util';
+import { inspect, InspectOptions, promisify } from 'util';
 import { ActivePunishment, ActivePunishmentType } from '../../models/ActivePunishment';
 import { BushNewsChannel } from '../discord.js/BushNewsChannel';
 import { BushTextChannel } from '../discord.js/BushTextChannel';
@@ -449,21 +449,56 @@ export class BushClientUtil extends ClientUtil {
 	/**
 	 * Surrounds text in a code block with the specified language and puts it in a hastebin if its too long.
 	 *
-	 * * Embed Description Limit = 2048 characters
+	 * * Embed Description Limit = 4096 characters
 	 * * Embed Field Limit = 1024 characters
 	 */
-	public async codeblock(code: string, length: number, language: 'ts' | 'js' | 'sh' | 'json' | '' = ''): Promise<string> {
+	public async codeblock(code: string, length: number, language?: 'ts' | 'js' | 'sh' | 'json'): Promise<string> {
 		let hasteOut = '';
 		const tildes = '```';
-		const formattingLength = 2 * tildes.length + language.length + 2 * '\n'.length;
+		const formattingLength = 2 * tildes.length + language?.length ?? 0 + 2 * '\n'.length;
 		if (code.length + formattingLength >= length) hasteOut = 'Too large to display. Hastebin: ' + (await this.haste(code));
 
 		const code2 = hasteOut ? code.substring(0, length - (hasteOut.length + '\n'.length + formattingLength)) : code;
 		return (
-			tildes + language + '\n' + Util.cleanCodeBlockContent(code2) + '\n' + tildes + (hasteOut.length ? '\n' + hasteOut : '')
+			tildes + language ??
+			'' + '\n' + Util.cleanCodeBlockContent(code2) + '\n' + tildes + (hasteOut.length ? '\n' + hasteOut : '')
 		);
 	}
 
+	private mapCredential(old: string) {
+		const mapping = {
+			['token']: 'Main Token',
+			['devToken']: 'Dev Token',
+			['betaToken']: 'Beta Token',
+			['hypixelApiKey']: 'Hypixel Api Key'
+		};
+		return mapping[old] || old;
+	}
+
+	/**
+	 * Redacts credentials from a string
+	 */
+	public redact(text: string) {
+		for (const credentialName in client.config.credentials) {
+			const credential = client.config.credentials[credentialName];
+			const replacement = this.mapCredential(credentialName);
+			const escapeRegex = /[.*+?^${}()|[\]\\]/g;
+			text = text.replace(new RegExp(credential.toString().replace(escapeRegex, '\\$&'), 'g'), `[${replacement} Omitted]`);
+			text = text.replace(
+				new RegExp([...credential.toString()].reverse().join('').replace(escapeRegex, '\\$&'), 'g'),
+				`[${replacement} Omitted]`
+			);
+		}
+		return text;
+	}
+
+	public async inspectCleanRedactCodeblock(input: any, language: 'ts' | 'js', inspectOptions?: InspectOptions) {
+		input = typeof input !== 'string' && inspectOptions !== undefined ? inspect(input, inspectOptions) : input;
+		input = Util.cleanCodeBlockContent(input);
+		input = this.redact(input);
+		return client.util.codeblock(input, 1024, language);
+	}
+
 	public async slashRespond(
 		interaction: CommandInteraction,
 		responseOptions: BushSlashSendMessageType | BushSlashEditMessageType
@@ -754,4 +789,8 @@ export class BushClientUtil extends ClientUtil {
 		const autoModPhases = await message.guild.getSetting('autoModPhases');
 		if (autoModPhases.includes(message.content.toString()) && message.deletable) message.delete();
 	}
+
+	public capitalizeFirstLetter(string: string): string {
+		return string.charAt(0)?.toUpperCase() + string.slice(1);
+	}
 }
diff --git a/src/lib/extensions/global.d.ts b/src/lib/extensions/global.d.ts
index 8c7a117..d4c5f61 100644
--- a/src/lib/extensions/global.d.ts
+++ b/src/lib/extensions/global.d.ts
@@ -1,9 +1,12 @@
 import { BushClient } from './discord-akairo/BushClient';
+import { BushClientUtil } from './discord-akairo/BushClientUtil';
 declare global {
 	namespace NodeJS {
 		export interface Global {
 			client: BushClient;
+			util: BushClientUtil;
 		}
 	}
 	const client: BushClient;
+	const util: BushClientUtil;
 }