Merge branch 'master' into beta

.eslintrc.json

@@ -25,7 +25,7 @@
 				"ts-expect-error": "allow-with-description",
 				"ts-ignore": "allow-with-description",
 				"ts-nocheck": "allow-with-description",
-				"ts-check": "allow-with-description",
+				"ts-check": false,
 				"minimumDescriptionLength": 5
 			}
 		],
@@ -57,6 +57,8 @@
 		"no-debugger": "warn",
 		"@typescript-eslint/prefer-as-const": "warn",
 		"@typescript-eslint/ban-types": "off",
-		"@typescript-eslint/no-inferrable-types": "off"
+		"@typescript-eslint/no-inferrable-types": "off",
+		"@typescript-eslint/no-unsafe-declaration-merging": "off",
+		"prefer-const": "warn"
 	}
 }

.github/workflows/checks.yml

@@ -10,10 +10,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Install node.js v18
+      - name: Install node.js v20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
@@ -34,38 +34,22 @@ jobs:
       - name: Dry Run
         run: yarn start:dry
 
-  formatting:
-    name: Formatting
+  check-format:
+    name: Check Formatting
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-          fetch-depth: 0
 
-      - name: Install node.js v18
+      - name: Install node.js v20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
       - name: Install dependencies
         run: yarn --immutable
 
-      - name: Configure Git
-        run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-
-      - name: Format and Commit
-        run: |
-          yarn format
-          git commit -am "Automatically format code" || true
-
-      - name: Push Changes
-        uses: NotEnoughUpdates/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+      - name: Prettier Check
+        run: yarn format:check

.gitignore

@@ -34,3 +34,5 @@ config/options.ts
 
 src/lib/badlinks-secret.ts
 lib/badlinks-secret.ts
+
+ecosystem-info.json

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn format 

.vscode/settings.json

@@ -16,8 +16,8 @@
 		"neu-item-repo": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.organizeImports": true,
-		"source.format": true
+		"source.organizeImports": "explicit",
+		"source.format": "explicit"
 	},
 	"editor.formatOnSave": true,
 	"diffEditor.wordWrap": "on",

.yarn/patches/mathjs-npm-11.8.0-b44b263405.patch → .yarn/patches/mathjs-npm-11.8.2-45050ba796.patch

@@ -1,5 +1,5 @@
 diff --git a/types/index.d.ts b/types/index.d.ts
-index e7d7e211e4a41c693bf1e8022490d0a0498cef0c..eb2a8d92477e91996515353a359bef35ce5bd60a 100644
+index 98ebe711148cbfd499da864118e0cabd1e2c9601..f17239d2d0bf9db11e3b4efa764a7e1eaef3daa9 100644
 --- a/types/index.d.ts
 +++ b/types/index.d.ts
 @@ -2,7 +2,7 @@ import { Decimal } from 'decimal.js'

.yarnrc.yml

@@ -1,17 +1,13 @@
+compressionLevel: mixed
+
 enableGlobalCache: true
 
 enableTelemetry: false
 
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: '@yarnpkg/plugin-typescript'
-
 pnpEnableEsmLoader: true
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

config/Config.ts

@@ -256,13 +256,23 @@ export type Logging = {
 	 * Whether or not to log database queries, verbose logs, or informational logs
 	 */
 	[Key in LoggingType]: boolean;
+} & {
+	/**
+	 * Override default behavior
+	 */
+	[Key in OverrideLog]?: boolean;
 };
 
 /**
  * The logging level that can be changed.
  */
 export type LoggingType = 'db' | 'verbose' | 'info';
 
+/**
+ * Override the default logging behavior
+ */
+export type OverrideLog = 'success' | 'error' | 'warn' | 'veryVerbose' | 'debug' | 'noMessage' | 'noRaw';
+
 /**
  * Information regarding the bot's support server.
  */

ecosystem.config.cjs

@@ -1,3 +1,13 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+let user, host;
+
+try {
+	({ user, host } = require('./ecosystem-info.json'));
+} catch (e) {
+	user = 'ironmoon';
+	host = 'localhost';
+}
+
 module.exports = {
 	apps: [
 		...['', '-beta'].map((e) => ({
@@ -19,8 +29,8 @@ module.exports = {
 			['production', 'beta'].map((e) => [
 				e,
 				{
-					'user': 'ironmoon',
-					'host': '192.168.1.11',
+					user,
+					host,
 					'ref': `origin/${e === 'production' ? 'master' : 'beta'}`,
 					'repo': 'https://github.com/TanzaniteBot/tanzanite.git',
 					'path': `/code/tanzanite${e === 'beta' ? '-beta' : ''}`,

jsconfig.json

@@ -0,0 +1 @@
+{ "extends": "./tsconfig.base.json" }

lib/automod/AutomodShared.ts

@@ -5,13 +5,13 @@ import { formatBanResponseId, formatUnmuteResponse } from '#lib/utils/FormatResp
 import {
 	ActionRowBuilder,
 	ButtonBuilder,
-	ButtonInteraction,
 	ButtonStyle,
 	ComponentType,
 	GuildMember,
-	Message,
 	PermissionFlagsBits,
 	type BaseMessageOptions,
+	type ButtonInteraction,
+	type Message,
 	type Snowflake
 } from 'discord.js';
 import assert from 'node:assert/strict';
@@ -280,7 +280,7 @@ export function handledComponents(action: 'ban' | 'unmute' | 'dismiss', tag: str
 /**
  * The severity of the blacklisted word
  */
-export const enum Severity {
+export enum Severity {
 	/**
 	 * Delete message
 	 */

lib/automod/MemberAutomod.ts

@@ -1,5 +1,5 @@
 import { stripIndent } from '#tags';
-import { EmbedBuilder, GuildMember } from 'discord.js';
+import { EmbedBuilder, type GuildMember } from 'discord.js';
 import { Automod, type BadWordDetails } from './AutomodShared.js';
 
 export class MemberAutomod extends Automod {

lib/automod/MessageAutomod.ts

@@ -1,7 +1,7 @@
-import { colors } from '#lib/utils/Constants.js';
+import { Time, colors } from '#lib/utils/Constants.js';
 import { format, formatError } from '#lib/utils/Utils.js';
 import { stripIndent } from '#tags';
-import chalk from 'chalk';
+//~ import chalk from 'chalk';
 import { EmbedBuilder, PermissionFlagsBits, type GuildTextBasedChannel, type Message } from 'discord.js';
 import assert from 'node:assert/strict';
 import { Automod, Severity, type BadWordDetails } from './AutomodShared.js';
@@ -86,7 +86,7 @@ export class MessageAutomod extends Automod {
 			if (!this.punished && (await this.guild.hasFeature('delScamMentions'))) void this.checkScamMentions();
 		}
 
-		if (!this.punished && (await this.guild.hasFeature('perspectiveApi'))) void this.checkPerspectiveApi();
+		// ~if (!this.punished && (await this.guild.hasFeature('perspectiveApi'))) void this.checkPerspectiveApi();
 	}
 
 	/**
@@ -141,52 +141,52 @@ export class MessageAutomod extends Automod {
 		}
 	}
 
-	protected async checkPerspectiveApi() {
-		return;
-		if (!this.client.config.isDevelopment) return;
+	//~ protected async checkPerspectiveApi() {
+	//~ 	return;
+	//~ 	if (!this.client.config.isDevelopment) return;
 
-		if (!this.message.content) return;
-		this.client.perspective.comments.analyze(
-			{
-				key: this.client.config.credentials.perspectiveApiKey,
-				resource: {
-					comment: {
-						text: this.message.content
-					},
-					requestedAttributes: {
-						TOXICITY: {},
-						SEVERE_TOXICITY: {},
-						IDENTITY_ATTACK: {},
-						INSULT: {},
-						PROFANITY: {},
-						THREAT: {},
-						SEXUALLY_EXPLICIT: {},
-						FLIRTATION: {}
-					}
-				}
-			},
-			(err: any, response: any) => {
-				if (err) return console.log(err?.message);
+	//~ 	if (!this.message.content) return;
+	//~ 	this.client.perspective.comments.analyze(
+	//~ 		{
+	//~ 			key: this.client.config.credentials.perspectiveApiKey,
+	//~ 			resource: {
+	//~ 				comment: {
+	//~ 					text: this.message.content
+	//~ 				},
+	//~ 				requestedAttributes: {
+	//~ 					TOXICITY: {},
+	//~ 					SEVERE_TOXICITY: {},
+	//~ 					IDENTITY_ATTACK: {},
+	//~ 					INSULT: {},
+	//~ 					PROFANITY: {},
+	//~ 					THREAT: {},
+	//~ 					SEXUALLY_EXPLICIT: {},
+	//~ 					FLIRTATION: {}
+	//~ 				}
+	//~ 			}
+	//~ 		},
+	//~ 		(err: any, response: any) => {
+	//~ 			if (err) return console.log(err?.message);
 
-				const normalize = (val: number, min: number, max: number) => (val - min) / (max - min);
+	//~ 			const normalize = (val: number, min: number, max: number) => (val - min) / (max - min);
 
-				const color = (val: number) => {
-					if (val >= 0.5) {
-						const x = 194 - Math.round(normalize(val, 0.5, 1) * 194);
-						return chalk.rgb(194, x, 0)(val);
-					} else {
-						const x = Math.round(normalize(val, 0, 0.5) * 194);
-						return chalk.rgb(x, 194, 0)(val);
-					}
-				};
+	//~ 			const color = (val: number) => {
+	//~ 				if (val >= 0.5) {
+	//~ 					const x = 194 - Math.round(normalize(val, 0.5, 1) * 194);
+	//~ 					return chalk.rgb(194, x, 0)(val);
+	//~ 				} else {
+	//~ 					const x = Math.round(normalize(val, 0, 0.5) * 194);
+	//~ 					return chalk.rgb(x, 194, 0)(val);
+	//~ 				}
+	//~ 			};
 
-				console.log(chalk.cyan(this.message.content));
-				Object.entries(response.data.attributeScores)
-					.sort(([a], [b]) => a.localeCompare(b))
-					.forEach(([key, value]: any[]) => console.log(chalk.white(key), color(value.summaryScore.value)));
-			}
-		);
-	}
+	//~ 			console.log(chalk.cyan(this.message.content));
+	//~ 			Object.entries(response.data.attributeScores)
+	//~ 				.sort(([a], [b]) => a.localeCompare(b))
+	//~ 				.forEach(([key, value]: any[]) => console.log(chalk.white(key), color(value.summaryScore.value)));
+	//~ 		}
+	//~ 	);
+	//~ }
 
 	/**
 	 * Punishes the user based on the severity of the offense
@@ -214,7 +214,7 @@ export class MessageAutomod extends Automod {
 				void this.member.customMute({
 					moderator: this.guild!.members.me!,
 					reason: `[Automod] ${highestOffense.reason}`,
-					duration: 900_000 // 15 minutes
+					duration: 15 * Time.Minute
 				});
 				this.punished = true;
 				break;

lib/automod/PresenceAutomod.ts

@@ -1,5 +1,5 @@
 import { stripIndent } from '#tags';
-import { EmbedBuilder, Presence } from 'discord.js';
+import { EmbedBuilder, type Presence } from 'discord.js';
 import { Automod, type BadWordDetails } from './AutomodShared.js';
 
 export class PresenceAutomod extends Automod {

lib/common/Appeals.ts

@@ -6,7 +6,7 @@ import {
 	formatUnmuteResponse,
 	formatUntimeoutResponse
 } from '#lib/utils/FormatResponse.js';
-import { capitalize, ModalInput } from '#lib/utils/Utils.js';
+import { ModalInput, capitalize } from '#lib/utils/Utils.js';
 import { AppealStatus, ModLog } from '#models';
 import {
 	ActionRowBuilder,