Cleanup

README.md

@@ -88,7 +88,9 @@ $ pnpm run setup-files
 
 9. Promote the Minecraft account used by the bot to Officer in-game in order for it to view the Officer chat and run privileged commands.
 
-10. Build and run the bot.
+10. On Hypixel, set the account's `Private Message Privacy` setting under `My Profile > Social Settings` to `Low` or `High`, allowing guild members to privately message the bot to see their weekly guild experience total.
+
+11. Build and run the bot.
 
 ```bash
 $ pnpm run build

src/@types/command.d.ts

@@ -5,7 +5,7 @@ declare interface Command {
 }
 
 type ExecuteCommand = (
-    bot: import('@classes/bot').default,
+    bridge: import('../bridge').default,
     interaction: import('discord.js').ChatInputCommandInteraction,
     args: unknown[]
 ) => Promise<void>;

src/@types/event.d.ts

@@ -1,10 +1,8 @@
-declare interface Event {
+declare interface BotEvent {
     name:
-        | keyof typeof import('@events/regex').default
+        | keyof typeof import('../mineflayer/events/regex').default
         | keyof import('mineflayer').BotEvents
         | keyof import('discord.js').ClientEvents;
     runOnce: boolean;
-    run: Execute;
+    run: (bridge: import('../bridge').default, ...params: any[]) => Promise<void>;
 }
-
-type Execute = (bot: import('@classes/bot').default, ...params: any[]) => Promise<void>;

src/bridge.ts

@@ -0,0 +1,54 @@
+import { ActivityType, IntentsBitField } from 'discord.js';
+import winston from 'winston';
+import env from '@util/env';
+import Discord from '@discord/discord';
+import Mineflayer from '@mineflayer/mineflayer';
+
+export default class Bridge {
+    public readonly discord = new Discord({
+        allowedMentions: { parse: ['users', 'roles'], repliedUser: true },
+        intents: [
+            IntentsBitField.Flags.Guilds,
+            IntentsBitField.Flags.GuildMessages,
+            IntentsBitField.Flags.MessageContent,
+        ],
+    });
+
+    public readonly mineflayer = new Mineflayer();
+    public onlineCount = 0;
+    public totalCount = 125;
+
+    constructor() {
+        try {
+            this.start();
+        } catch (error) {
+            winston.error(error);
+        }
+    }
+
+    public setStatus() {
+        const plural = this.onlineCount - 1 !== 1;
+
+        if (this.discord.isReady()) {
+            this.discord.user.setActivity(
+                `${this.onlineCount - 1} online player${plural ? 's' : ''}`,
+                {
+                    type: ActivityType.Watching,
+                }
+            );
+        }
+    }
+
+    private async start() {
+        await Promise.all([
+            this.discord.loadCommands(),
+            this.discord.loadEvents(this),
+            this.mineflayer.loadEvents(this),
+        ]);
+
+        await this.discord.login(env.DISCORD_TOKEN);
+    }
+}
+
+const handleError = (e: Error) => winston.error(e);
+process.on('uncaughtException', handleError).on('unhandledRejection', handleError);

src/commands/blacklist.ts → src/discord/commands/blacklist.ts

@@ -51,7 +51,7 @@ export default {
             },
         ],
     },
-    run: async (bot, interaction, args) => {
+    run: async (bridge, interaction, args) => {
         const type = interaction.options.getSubcommand() as 'add' | 'remove';
         const mojangProfile = await fetchMojangProfile(args[0] as string);
         const blacklist = _blacklist as BlacklistEntry[];
@@ -92,7 +92,7 @@ export default {
                 ]);
 
             const blacklistMessage = await (
-                (await bot.discord.channels.fetch(env.BLACKLIST_CHANNEL_ID)) as TextChannel
+                (await bridge.discord.channels.fetch(env.BLACKLIST_CHANNEL_ID)) as TextChannel
             ).send({
                 embeds: [embed],
             });
@@ -109,7 +109,7 @@ export default {
             blacklist.splice(blacklist.indexOf(blacklistEntry));
 
             const message = await (
-                bot.discord.channels.cache.get(env.BLACKLIST_CHANNEL_ID) as TextChannel
+                bridge.discord.channels.cache.get(env.BLACKLIST_CHANNEL_ID) as TextChannel
             ).messages.fetch(blacklistEntry.messageId);
             await message.delete();
         }

src/commands/command.ts → src/discord/commands/command.ts

@@ -13,12 +13,12 @@ export default {
             },
         ],
     },
-    run: async (bot, interaction, args) => {
+    run: async (bridge, interaction, args) => {
         const command = (args[0] as string).startsWith('/') ? (args[0] as string) : `/${args[0]}`;
         const embed = new EmbedBuilder();
 
         try {
-            await bot.executeTask(command);
+            await bridge.mineflayer.execute(command, true);
 
             embed
                 .setColor('Green')