restructure, experimental presence and member automod, fixed bugs probably made some more bugs

13 files changed, 16 insertions, 14 deletions

diff --git a/src/commands/admin/channelPermissions.ts b/src/commands/admin/channelPermissions.ts
index 0b09e54..21abd04 100644
--- a/src/commands/admin/channelPermissions.ts
+++ b/src/commands/admin/channelPermissions.ts
@@ -1,6 +1,5 @@
 import {
 	Arg,
-	BushCommand,
 	ButtonPaginator,
 	clientSendAndPermCheck,
 	emojis,
@@ -11,6 +10,7 @@ import {
 } from '#lib';
 import assert from 'assert/strict';
 import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
+import { BushCommand } from '../../../lib/extensions/discord-akairo/BushCommand.js';
 
 export default class ChannelPermissionsCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts
index ac0ad83..0606497 100644
--- a/src/commands/dev/test.ts
+++ b/src/commands/dev/test.ts
@@ -18,9 +18,9 @@ import {
 	type ApplicationCommand,
 	type Collection
 } from 'discord.js';
-import badLinksSecretArray from '../../lib/badlinks-secret.js';
-import badLinksArray from '../../lib/badlinks.js';
-import badWords from '../../lib/badwords.js';
+import badLinksSecretArray from '../../../lib/badlinks-secret.js';
+import badLinksArray from '../../../lib/badlinks.js';
+import badWords from '../../../lib/badwords.js';
 
 export default class TestCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index 348c74f..62f177e 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -9,6 +9,7 @@ import {
 	type OptArgType,
 	type SlashMessage
 } from '#lib';
+import { stripIndent } from '#tags';
 import assert from 'assert/strict';
 import {
 	ActionRowBuilder,
@@ -21,7 +22,6 @@ import {
 } from 'discord.js';
 import Fuse from 'fuse.js';
 import packageDotJSON from '../../../package.json' assert { type: 'json' };
-import { stripIndent } from '../../lib/common/tags.js';
 
 assert(Fuse);
 assert(packageDotJSON);
diff --git a/src/commands/moderation/massEvidence.ts b/src/commands/moderation/massEvidence.ts
index 62f4825..cecf273 100644
--- a/src/commands/moderation/massEvidence.ts
+++ b/src/commands/moderation/massEvidence.ts
@@ -13,7 +13,7 @@ import {
 } from '#lib';
 import assert from 'assert/strict';
 import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js';
-import { EvidenceCommand } from '../index.js';
+import EvidenceCommand from './evidence.js';
 
 export default class MassEvidenceCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/myLogs.ts b/src/commands/moderation/myLogs.ts
index ab67a18..c1cc448 100644
--- a/src/commands/moderation/myLogs.ts
+++ b/src/commands/moderation/myLogs.ts
@@ -12,7 +12,7 @@ import {
 } from '#lib';
 
 import { ApplicationCommandOptionType } from 'discord.js';
-import { input, sanitizeInputForDiscord } from '../../lib/common/util/Format.js';
+import { input, sanitizeInputForDiscord } from '../../../lib/utils/Format.js';
 import ModlogCommand from './modlog.js';
 export default class MyLogsCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/unmute.ts b/src/commands/moderation/unmute.ts
index 648a178..620f499 100644
--- a/src/commands/moderation/unmute.ts
+++ b/src/commands/moderation/unmute.ts
@@ -14,7 +14,7 @@ import {
 } from '#lib';
 import assert from 'assert/strict';
 import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand.js';
+import { BushCommand } from '../../../lib/extensions/discord-akairo/BushCommand.js';
 
 export default class UnmuteCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts
index d07ba53..fcb6f23 100644
--- a/src/commands/moulberry-bush/neuRepo.ts
+++ b/src/commands/moulberry-bush/neuRepo.ts
@@ -10,7 +10,7 @@ import {
 import { dirname, join } from 'path';
 import tinycolor from 'tinycolor2';
 import { fileURLToPath } from 'url';
-import { formattingInfo, RawNeuItem } from '../../lib/common/util/Minecraft.js';
+import { formattingInfo, RawNeuItem } from '../../../lib/utils/Minecraft.js';
 
 export default class NeuRepoCommand extends BushCommand {
 	public static items: { name: string; id: string }[] = [];
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index 25a3ef0..ab5500d 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -8,8 +8,8 @@ import {
 	type OptArgType,
 	type SlashMessage
 } from '#lib';
+import { stripIndent } from '#tags';
 import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
-import { stripIndent } from '../../lib/common/tags.js';
 
 const rules = [
 	{
diff --git a/src/commands/utilities/calculator.ts b/src/commands/utilities/calculator.ts
index c9dbbf2..dc5593b 100644
--- a/src/commands/utilities/calculator.ts
+++ b/src/commands/utilities/calculator.ts
@@ -52,7 +52,7 @@ export default class CalculatorCommand extends BushCommand {
 					name: '📤 Output',
 					value: await this.client.utils.inspectCleanRedactCodeblock(calculated.toString(), 'mma')
 				});
-		} catch (error) {
+		} catch (error: any) {
 			decodedEmbed
 				.setTitle(`${emojis.errorFull} Unable to Calculate Expression`)
 				.setColor(colors.error)
diff --git a/src/commands/utilities/highlight-block.ts b/src/commands/utilities/highlight-block.ts
index a450d71..58e7766 100644
--- a/src/commands/utilities/highlight-block.ts
+++ b/src/commands/utilities/highlight-block.ts
@@ -2,7 +2,7 @@ import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage
 import assert from 'assert/strict';
 import { Argument, ArgumentGeneratorReturn } from 'discord-akairo';
 import { BaseChannel, GuildMember, User } from 'discord.js';
-import { HighlightBlockResult } from '../../lib/common/HighlightManager.js';
+import { HighlightBlockResult } from '../../../lib/common/HighlightManager.js';
 import { highlightSubcommands } from './highlight-!.js';
 
 export default class HighlightBlockCommand extends BushCommand {
diff --git a/src/commands/utilities/highlight-unblock.ts b/src/commands/utilities/highlight-unblock.ts
index 702fa65..2238831 100644
--- a/src/commands/utilities/highlight-unblock.ts
+++ b/src/commands/utilities/highlight-unblock.ts
@@ -2,7 +2,7 @@ import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage
 import assert from 'assert';
 import { Argument, ArgumentGeneratorReturn } from 'discord-akairo';
 import { BaseChannel, GuildMember, User } from 'discord.js';
-import { HighlightUnblockResult } from '../../lib/common/HighlightManager.js';
+import { HighlightUnblockResult } from '../../../lib/common/HighlightManager.js';
 import { highlightSubcommands } from './highlight-!.js';
 
 export default class HighlightUnblockCommand extends BushCommand {
diff --git a/src/commands/utilities/uuid.ts b/src/commands/utilities/uuid.ts
index 3f99e66..04d4013 100644
--- a/src/commands/utilities/uuid.ts
+++ b/src/commands/utilities/uuid.ts
@@ -23,7 +23,7 @@ export default class UuidCommand extends BushCommand {
 				{
 					id: 'ign',
 					description: 'The ign to find the ign of.',
-					customType: /\w{1,16}/im,
+					customType: /^\w{1,16}$/im,
 					readableType: 'string[1,16]',
 					prompt: 'What ign would you like to find the uuid of?',
 					retry: '{error} Choose a valid ign.',
diff --git a/src/commands/utilities/wolframAlpha.ts b/src/commands/utilities/wolframAlpha.ts
index b35e14f..5ba55f7 100644
--- a/src/commands/utilities/wolframAlpha.ts
+++ b/src/commands/utilities/wolframAlpha.ts
@@ -87,6 +87,8 @@ export default class WolframAlphaCommand extends BushCommand {
 				});
 			}
 		} catch (error) {
+			assert(error instanceof Error);
+
 			decodedEmbed
 				.setTitle(`${emojis.errorFull} Unable to Query Expression`)
 				.setColor(colors.error)