1 files changed, 96 insertions, 91 deletions
diff --git a/src/lib/common/util/Format.ts b/src/lib/common/util/Format.ts
index 6cb6edc..260a0be 100644
--- a/src/lib/common/util/Format.ts
+++ b/src/lib/common/util/Format.ts
@@ -1,107 +1,112 @@
 import { type CodeBlockLang } from '#lib';
-import { EscapeMarkdownOptions, Formatters, Util } from 'discord.js';
+import {
+	escapeBold,
+	escapeCodeBlock,
+	escapeInlineCode,
+	escapeItalic,
+	EscapeMarkdownOptions,
+	escapeSpoiler,
+	escapeStrikethrough,
+	escapeUnderline,
+	Formatters
+} from 'discord.js';
 
 /**
- * Formats and escapes content for formatting
+ * Wraps the content inside a codeblock with no language.
+ * @param content The content to wrap.
  */
-export class Format {
-	/**
-	 * Wraps the content inside a codeblock with no language.
-	 * @param content The content to wrap.
-	 */
-	public static codeBlock(content: string): string;
+export function codeBlock(content: string): string;
 
-	/**
-	 * Wraps the content inside a codeblock with the specified language.
-	 * @param language The language for the codeblock.
-	 * @param content The content to wrap.
-	 */
-	public static codeBlock(language: CodeBlockLang, content: string): string;
-	public static codeBlock(languageOrContent: string, content?: string): string {
-		return typeof content === 'undefined'
-			? Formatters.codeBlock(Util.escapeCodeBlock(`${languageOrContent}`))
-			: Formatters.codeBlock(`${languageOrContent}`, Util.escapeCodeBlock(`${content}`));
-	}
+/**
+ * Wraps the content inside a codeblock with the specified language.
+ * @param language The language for the codeblock.
+ * @param content The content to wrap.
+ */
+export function codeBlock(language: CodeBlockLang, content: string): string;
+export function codeBlock(languageOrContent: string, content?: string): string {
+	return typeof content === 'undefined'
+		? Formatters.codeBlock(escapeCodeBlock(`${languageOrContent}`))
+		: Formatters.codeBlock(`${languageOrContent}`, escapeCodeBlock(`${content}`));
+}
 
-	/**
-	 * Wraps the content inside \`backticks\`, which formats it as inline code.
-	 * @param content The content to wrap.
-	 */
-	public static inlineCode(content: string): string {
-		return Formatters.inlineCode(Util.escapeInlineCode(`${content}`));
-	}
+/**
+ * Wraps the content inside \`backticks\`, which formats it as inline code.
+ * @param content The content to wrap.
+ */
+export function inlineCode(content: string): string {
+	return Formatters.inlineCode(escapeInlineCode(`${content}`));
+}
 
-	/**
-	 * Formats the content into italic text.
-	 * @param content The content to wrap.
-	 */
-	public static italic(content: string): string {
-		return Formatters.italic(Util.escapeItalic(`${content}`));
-	}
+/**
+ * Formats the content into italic text.
+ * @param content The content to wrap.
+ */
+export function italic(content: string): string {
+	return Formatters.italic(escapeItalic(`${content}`));
+}
 
-	/**
-	 * Formats the content into bold text.
-	 * @param content The content to wrap.
-	 */
-	public static bold(content: string): string {
-		return Formatters.bold(Util.escapeBold(`${content}`));
-	}
+/**
+ * Formats the content into bold text.
+ * @param content The content to wrap.
+ */
+export function bold(content: string): string {
+	return Formatters.bold(escapeBold(`${content}`));
+}
 
-	/**
-	 * Formats the content into underscored text.
-	 * @param content The content to wrap.
-	 */
-	public static underscore(content: string): string {
-		return Formatters.underscore(Util.escapeUnderline(`${content}`));
-	}
+/**
+ * Formats the content into underscored text.
+ * @param content The content to wrap.
+ */
+export function underscore(content: string): string {
+	return Formatters.underscore(escapeUnderline(`${content}`));
+}
 
-	/**
-	 * Formats the content into strike-through text.
-	 * @param content The content to wrap.
-	 */
-	public static strikethrough(content: string): string {
-		return Formatters.strikethrough(Util.escapeStrikethrough(`${content}`));
-	}
+/**
+ * Formats the content into strike-through text.
+ * @param content The content to wrap.
+ */
+export function strikethrough(content: string): string {
+	return Formatters.strikethrough(escapeStrikethrough(`${content}`));
+}
 
-	/**
-	 * Wraps the content inside spoiler (hidden text).
-	 * @param content The content to wrap.
-	 */
-	public static spoiler(content: string): string {
-		return Formatters.spoiler(Util.escapeSpoiler(`${content}`));
-	}
+/**
+ * Wraps the content inside spoiler (hidden text).
+ * @param content The content to wrap.
+ */
+export function spoiler(content: string): string {
+	return Formatters.spoiler(escapeSpoiler(`${content}`));
+}
 
-	/**
-	 * Escapes any Discord-flavour markdown in a string.
-	 * @param text Content to escape
-	 * @param options Options for escaping the markdown
-	 */
-	public static escapeMarkdown(text: string, options?: EscapeMarkdownOptions): string {
-		return Util.escapeMarkdown(`${text}`, options);
-	}
+/**
+ * Escapes any Discord-flavour markdown in a string.
+ * @param text Content to escape
+ * @param options Options for escaping the markdown
+ */
+export function escapeMarkdown(text: string, options?: EscapeMarkdownOptions): string {
+	return escapeMarkdown(`${text}`, options);
+}
 
-	/**
-	 * Formats input: makes it bold and escapes any other markdown
-	 * @param text The input
-	 */
-	public static input(text: string): string {
-		return this.bold(this.escapeMarkdown(this.sanitizeWtlAndControl(`${text}`)));
-	}
+/**
+ * Formats input: makes it bold and escapes any other markdown
+ * @param text The input
+ */
+export function input(text: string): string {
+	return bold(escapeMarkdown(sanitizeWtlAndControl(`${text}`)));
+}
 
-	/**
-	 * Formats input for logs: makes it highlighted
-	 * @param text The input
-	 */
-	public static inputLog(text: string): string {
-		return `<<${this.sanitizeWtlAndControl(`${text}`)}>>`;
-	}
+/**
+ * Formats input for logs: makes it highlighted
+ * @param text The input
+ */
+export function inputLog(text: string): string {
+	return `<<${sanitizeWtlAndControl(`${text}`)}>>`;
+}
 
-	/**
-	 * Removes all characters in a string that are either control characters or change the direction of text etc.
-	 * @param str The string you would like sanitized
-	 */
-	public static sanitizeWtlAndControl(str: string) {
-		// eslint-disable-next-line no-control-regex
-		return `${str}`.replace(/[\u0000-\u001F\u007F-\u009F\u200B]/g, '');
-	}
+/**
+ * Removes all characters in a string that are either control characters or change the direction of text etc.
+ * @param str The string you would like sanitized
+ */
+export function sanitizeWtlAndControl(str: string) {
+	// eslint-disable-next-line no-control-regex
+	return `${str}`.replace(/[\u0000-\u001F\u007F-\u009F\u200B]/g, '');
 }