[WIP] v4: TypeScript rewrite and implementation of application commands

example.env

@@ -20,3 +20,6 @@ STEAM_API_KEY=
 TMDB_API_KEY=
 TWITCH_API_KEY=
 TWITCH_CLIENT_ID=
+
+# The database URL
+DATABASE_URL=

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "stalwartle",
 	"description": "A Discord Bot for Discordians' basic needs",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"main": "src/app.js",
 	"scripts": {
 		"start": "pm2 start src/app.js --name Stalwartle --node-args=\"--expose_gc --always_compact\"",
@@ -18,19 +18,19 @@
 	},
 	"homepage": "https://github.com/insane-devs/stalwartle#readme",
 	"dependencies": {
-		"@sapphire/discord.js-utilities": "^4.11.3",
+		"@sapphire/discord.js-utilities": "^5.0.0",
 		"@sapphire/duration": "^1.0.0",
-		"@sapphire/framework": "^2.5.1",
-		"@sapphire/pieces": "^3.3.4",
-		"@sapphire/plugin-editable-commands": "^1.2.2",
-		"@sapphire/plugin-logger": "^2.2.3",
-		"@sapphire/plugin-scheduled-tasks": "3.0.0",
-		"@sapphire/plugin-subcommands": "^2.2.2",
+		"@sapphire/framework": "^3.1.0",
+		"@sapphire/pieces": "^3.5.1",
+		"@sapphire/plugin-editable-commands": "^2.0.1",
+		"@sapphire/plugin-logger": "^3.0.0",
+		"@sapphire/plugin-scheduled-tasks": "4.0.0",
+		"@sapphire/plugin-subcommands": "^3.2.0",
 		"@sapphire/stopwatch": "^1.4.1",
 		"@sapphire/timestamp": "^1.0.0",
 		"@sapphire/type": "^2.2.4",
-		"@sapphire/utilities": "^3.7.0",
-		"bullmq": "^1.86.7",
+		"@sapphire/utilities": "^3.9.2",
+		"bullmq": "^1.90.0",
 		"cron-validator": "^1.3.1",
 		"discord.js": "^13.11.0",
 		"dotenv": "^16.0.3",

src/commands/Admin/Bot Owner/addcl.js

@@ -17,8 +17,38 @@ module.exports = class extends Command {
         this.usage = '<Content:string>';
     }
 
+    registerApplicationCommands(registry) {
+        registry.registerChatInputCommand(builder =>
+            builder
+                .setName(this.name)
+                .setDescription(this.description)
+                .addStringOption(option =>
+                    option
+                        .setName('changelog')
+                        .setDescription('The changelog to post.')
+                        .setRequired(true))
+        , {
+            guildIds: [this.container.client.options.devServer],
+            idHints: ['1014142821265068133']
+        });
+    }
+
+    chatInputRun(interaction) {
+        const changelog = interaction.options.getString('changelog');
+
+        this.container.client.channels.cache.get(this.container.client.settings.changelogs).send({
+            embeds: [
+                new MessageEmbed()
+                    .setTitle(`<a:updating:417233654545383424> ${this.container.client.user.username}'s Changelog`)
+                    .setDescription(changelog)
+                    .setTimestamp()]
+        });
+
+        return interaction.reply({ content: `${this.container.constants.EMOTES.tick}  ::  Successfully posted changelog!`, ephemeral: true });
+    }
+
     async messageRun(msg, args) {
-        const changelog = await args.rest('string').catch(() => null);
+        const changelog = await args.rest('string').then(str => str.trim()).catch(() => null);
         if (changelog === null) return reply(msg, `${this.container.constants.EMOTES.xmark}  ::  Please supply the new changelog.`);
 
         this.container.client.channels.cache.get(this.container.client.settings.changelogs).send({

src/commands/Admin/Bot Owner/blacklist.js

@@ -2,6 +2,7 @@ const { Command } = require('@sapphire/framework');
 const { reply } = require('@sapphire/plugin-editable-commands');
 const { codeBlock } = require('@sapphire/utilities');
 const { User } = require('discord.js');
+const { promisify } = require('util');
 
 module.exports = class extends Command {
 
@@ -16,6 +17,43 @@ module.exports = class extends Command {
         this.terms = ['usersAdded', 'usersRemoved', 'guildsAdded', 'guildsRemoved'];
     }
 
+    registerApplicationCommands(registry) {
+        registry.registerChatInputCommand(builder =>
+            builder
+                .setName(this.name)
+                .setDescription(this.description)
+                .addUserOption(option =>
+                    option
+                        .setName('user')
+                        .setDescription('The user to blacklist.'))
+                .addStringOption(option =>
+                    option
+                        .setName('server')
+                        .setDescription('The ID of the server to blacklist.'))
+        , {
+            guildIds: [this.container.client.options.devServer],
+            idHints: ['1014174483562647632']
+        });
+    }
+
+    async chatInputRun(interaction) {
+        const user = await promisify(interaction.options.getUser)('user', true).catch(() => null);
+        const guild = await promisify(interaction.options.getString)('server', true).catch(() => null);
+
+        if (user === null && guild === null) return interaction.reply({ content: `${this.container.constants.EMOTES.xmark}  ::  Please give the user or guild ID to blacklist.`, ephemeral: true });
+
+        const { userBlacklist, guildBlacklist } = this.container.client.settings;
+        if (user !== null) userBlacklist.push(user.id);
+        if (guild !== null) guildBlacklist.push(guild);
+
+        await this.container.stores.get('gateways').get('clientGateway').update(this.container.client.user.id, { userBlacklist, guildBlacklist });
+
+        return interaction.reply({
+            content: `${this.container.constants.EMOTES.check}  ::  Successfully blacklisted ${user ? 'user' : 'guild'} ${user ? `**${user.tag}**` : guild}${guild && user ? ` and guild **${guild}**` : ''}.`,
+            ephemeral: true
+        });
+    }
+
     async messageRun(message, args) {
         let usersAndGuilds = await args.pickResult('user');
         if (!usersAndGuilds.success) usersAndGuilds = await args.restResult('string');

src/commands/Admin/Bot Owner/disable.js

@@ -1,18 +1,48 @@
 const { Command } = require('@sapphire/framework');
 const { reply } = require('@sapphire/plugin-editable-commands');
+const { promisify } = require('util');
 
 module.exports = class extends Command {
 
     constructor(context, options) {
         super(context, {
             ...options,
             preconditions: ['OwnersOnly'],
-            description: 'Re-enables or temporarily disables a piece. Default state restored on reboot.'
+            description: 'Re-disables or temporarily disables a piece. Default state restored on reboot.'
         });
         this.usage = '<Piece:piece>';
         this.guarded = true;
     }
 
+    registerApplicationCommands(registry) {
+        registry.registerChatInputCommand(builder =>
+            builder
+                .setName(this.name)
+                .setDescription(this.description)
+                .addStringOption(option =>
+                    option
+                        .setName('piece')
+                        .setDescription('The name of the piece to disable.')
+                        .setRequired(true))
+        , {
+            guildIds: [this.container.client.options.devServer],
+            idHints: ['1015443730473426984']
+        });
+    }
+
+    async chatInputRun(interaction) {
+        const piece = await promisify(interaction.options.getString).bind(this)('piece').then(str => this.container.stores.get('arguments').get('piece').run(str)).catch(() => null);
+        if (piece === null) return interaction.reply({ content: `${this.container.constants.EMOTES.xmark}  ::  Invalid piece name.`, ephemeral: true });
+
+        piece.enabled = false;
+        if (this.container.client.shard) {
+            await this.container.client.shard.broadcastEval(`
+                if (String(this.options.shards) !== '${this.container.client.options.shards}') this.container.stores.get('${piece.store.name}').get('${piece.name}').enabled = false;
+            `);
+        }
+        return interaction.reply({ content: `${this.container.constants.EMOTES.tick}  ::  Successfully disabled \`${piece.name}\` from ${piece.store.name}.`, ephemeral: true });
+    }
+
     async messageRun(message, args) {
         const piece = await args.pick('piece').catch(() => null);
         if (piece === null) return reply(message, `${this.container.constants.EMOTES.xmark}  ::  Please supply the name of the piece you want to disable.`);

src/commands/Admin/Bot Owner/enable.js

@@ -1,5 +1,6 @@
 const { Command } = require('@sapphire/framework');
 const { reply } = require('@sapphire/plugin-editable-commands');
+const { promisify } = require('util');
 
 module.exports = class extends Command {
 
@@ -13,6 +14,35 @@ module.exports = class extends Command {
         this.guarded = true;
     }
 
+    registerApplicationCommands(registry) {
+        registry.registerChatInputCommand(builder =>
+            builder
+                .setName(this.name)
+                .setDescription(this.description)
+                .addStringOption(option =>
+                    option
+                        .setName('piece')
+                        .setDescription('The name of the piece to enable.')
+                        .setRequired(true))
+        , {
+            guildIds: [this.container.client.options.devServer],
+            idHints: ['1015443731895304283']
+        });
+    }
+
+    async chatInputRun(interaction) {
+        const piece = await promisify(interaction.options.getString).bind(this)('piece').then(str => this.container.stores.get('arguments').get('piece').run(str)).catch(() => null);
+        if (piece === null) return interaction.reply({ content: `${this.container.constants.EMOTES.xmark}  ::  Invalid piece name.`, ephemeral: true });
+
+        piece.enabled = true;
+        if (this.container.client.shard) {
+            interaction.client.shard.broadcastEval(`
+                if (String(this.options.shards) !== '${this.container.client.options.shards}') this.container.stores.get('${piece.store.name}').get('${piece.name}').enabled = true;
+            `);
+        }
+        return interaction.reply({ content: `${this.container.constants.EMOTES.tick}  ::  Successfully enabled \`${piece.name}\` to ${piece.store.name}.`, ephemeral: true });
+    }
+
     async messageRun(message, args) {
         const piece = await args.pick('piece').catch(() => null);
         if (piece === null) return reply(message, `${this.container.constants.EMOTES.xmark}  ::  Please supply the name of the piece you want to enable.`);