Merge branch 'dev'

Author: BenSegal855

.yarn/releases/yarn-3.8.0.cjs .yarn/releases/yarn-3.8.7.cjs

@@ -2,4 +2,4 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.8.0.cjs
+yarnPath: .yarn/releases/yarn-3.8.7.cjs

.yarnrc.yml

@@ -10,8 +10,8 @@
 	},
 	"dependencies": {
 		"@discordjs/collection": "2.0.0",
-		"@octokit/rest": "20.0.2",
-		"@sapphire/decorators": "6.0.4",
+		"@octokit/rest": "20.1.2",
+		"@sapphire/decorators": "6.1.1",
 		"@sapphire/discord-utilities": "3.2.2",
 		"@sapphire/discord.js-utilities": "7.1.6",
 		"@sapphire/fetch": "2.4.2",
@@ -21,11 +21,11 @@
 		"@sapphire/plugin-logger": "3.0.7",
 		"@sapphire/plugin-subcommands": "^5.0.0",
 		"@sapphire/stopwatch": "1.5.2",
-		"@sapphire/time-utilities": "1.7.12",
+		"@sapphire/time-utilities": "1.7.14",
 		"@sapphire/type": "^2.6.0",
-		"@sapphire/utilities": "3.15.3",
+		"@sapphire/utilities": "3.18.2",
 		"@skyra/env-utilities": "^1.2.1",
-		"axios": "1.6.7",
+		"axios": "1.8.1",
 		"canvas": "2.11.2",
 		"chart.js": "3.9.1",
 		"chartjs-node-canvas": "4.1.6",
@@ -41,7 +41,7 @@
 		"parse-duration": "1.1.0",
 		"pdf2json": "^3.0.3",
 		"pretty-ms": "7.0.1",
-		"reflect-metadata": "0.1.13"
+		"reflect-metadata": "0.2.2"
 	},
 	"_moduleAliases": {
 		"@root": "dist",
@@ -50,17 +50,17 @@
 	"devDependencies": {
 		"@sapphire/ts-config": "^5.0.0",
 		"@types/common-tags": "1.8.4",
-		"@types/node": "20.10.5",
+		"@types/node": "20.17.19",
 		"@types/node-cron": "3.0.11",
-		"@types/ws": "8.5.10",
+		"@types/ws": "8.5.14",
 		"@typescript-eslint/eslint-plugin": "6.21.0",
 		"@typescript-eslint/parser": "6.21.0",
-		"eslint": "8.56.0",
+		"eslint": "8.57.1",
 		"eslint-plugin-deprecation": "1.5.0",
 		"npm-run-all": "4.1.5",
 		"rimraf": "4.4.1",
-		"tsc-watch": "6.0.4",
-		"tslib": "2.6.2",
+		"tsc-watch": "6.2.1",
+		"tslib": "2.8.1",
 		"typescript": "^5.7.3"
 	},
 	"scripts": {
@@ -77,5 +77,5 @@
 		"clean:purge": "rimraf node_modules dist yarn.lock package-lock.json",
 		"updeps": "yarn clean:purge && yarn install"
 	},
-	"packageManager": "yarn@3.8.0"
+	"packageManager": "yarn@3.8.7"
 }

package.json

@@ -1,24 +1,24 @@
 import { ApplyOptions } from '@sapphire/decorators';
 import type { CommandOptions } from '@sapphire/framework';
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, type Message } from 'discord.js';
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionFlagsBits, type Message } from 'discord.js';
 import { SteveCommand } from '@lib/extensions/SteveCommand';
 import { send } from '@sapphire/plugin-editable-commands';
 import { oneLine } from 'common-tags';
 
 @ApplyOptions<CommandOptions>({
 	description: 'Creates **The Button**',
-	preconditions: ['OwnerOnly']
+	requiredUserPermissions: PermissionFlagsBits.Administrator
 })
 export class UserCommand extends SteveCommand {
 
 	public async messageRun(msg: Message) {
 		await send(msg, {
-			content: `# The Button\n${oneLine(`Below is **The Button**. Clicking it will immediately notify Ben. You can choose
-			to add context or not.`)}`,
+			content: `# The Button\n${oneLine(`Below is **The Button**. Clicking it will immediately notify ${msg.author.displayName}.
+			You can choose to add context or not.`)}`,
 			components: [
 				new ActionRowBuilder<ButtonBuilder>()
 					.addComponents(new ButtonBuilder()
-						.setCustomId('SafetyButton')
+						.setCustomId(`SafetyButton|${msg.author.id}`)
 						.setLabel('The Button')
 						.setStyle(ButtonStyle.Primary)
 					)

src/commands/Admin/makeButton.ts

@@ -43,7 +43,7 @@ export class UserCommand extends SteveCommand {
 		const currentSlot = schedule.find(slot => slot.end > now && slot.start < now);
 
 		if (!currentSlot) {
-			return embed.setTitle('The Project for Awesome is almost here! See you soon!');
+			return embed.setTitle('The Project for Awesome is over. See you next year!');
 		}
 
 		const nextSlotTime = new Date(currentSlot.end);

src/commands/Info/p4a.ts

@@ -51,7 +51,7 @@ const main = async () => {
 		client.user?.setPresence({
 			activities: [
 				{
-					type: ActivityType.Playing,
+					type: ActivityType.Custom,
 					name: `${prefix}help`
 				}
 			]

src/index.ts

@@ -1,6 +1,6 @@
 import { ApplyOptions } from '@sapphire/decorators';
 import { InteractionHandler, type InteractionHandlerOptions, InteractionHandlerTypes } from '@sapphire/framework';
-import { ActionRowBuilder, ButtonInteraction, ModalBuilder, ModalSubmitInteraction, TextInputBuilder, TextInputStyle } from 'discord.js';
+import { ActionRowBuilder, ButtonInteraction, MessageFlags, ModalBuilder, ModalSubmitInteraction, TextInputBuilder, TextInputStyle } from 'discord.js';
 
 @ApplyOptions<InteractionHandlerOptions>({
 	interactionHandlerType: InteractionHandlerTypes.Button,
@@ -9,25 +9,23 @@ import { ActionRowBuilder, ButtonInteraction, ModalBuilder, ModalSubmitInteracti
 export class TheButtonClick extends InteractionHandler {
 
 	public async parse(interaction: ButtonInteraction) {
-		if (interaction.customId !== 'SafetyButton') {
+		if (!interaction.customId.startsWith('SafetyButton')) {
 			return this.none();
 		}
 
-		return this.some();
+		const [, userId] = interaction.customId.split('|');
+		return this.some(userId);
 	}
 
-	public async run(interaction: ButtonInteraction) {
-		if (!process.env.OWNERS) {
-			throw new Error('No Owners defined');
-		}
-		await this.container.client.users.fetch(process.env.OWNERS).then(owner => owner.send('**The Button** was pressed'));
+	public async run(interaction: ButtonInteraction, userId: InteractionHandler.ParseResult<this>) {
+		await this.container.client.users.fetch(userId).then(user => user.send('**The Button** was pressed'));
 
 		interaction.showModal(new ModalBuilder()
-			.setCustomId('SafetyModal')
+			.setCustomId(`SafetyModal|${userId}`)
 			.setTitle('You clicked The Button')
 			.addComponents(new ActionRowBuilder<TextInputBuilder>().addComponents(
 				new TextInputBuilder()
-					.setCustomId('SafetyContext')
+					.setCustomId(`SafetyContext`)
 					.setLabel('Add context to your click?')
 					.setStyle(TextInputStyle.Paragraph)
 					.setPlaceholder('Please click submit with this box empty if you wish to not add context')
@@ -45,26 +43,23 @@ export class TheButtonClick extends InteractionHandler {
 export class TheButtonModal extends InteractionHandler {
 
 	public async parse(interaction: ModalSubmitInteraction) {
-		if (interaction.customId !== 'SafetyModal') {
+		if (!interaction.customId.startsWith('SafetyModal')) {
 			return this.none();
 		}
 
-		return this.some();
+		const [, userId] = interaction.customId.split('|');
+		return this.some(userId);
 	}
 
-	public async run(interaction: ModalSubmitInteraction) {
-		if (!process.env.OWNERS) {
-			throw new Error('No Owners defined');
-		}
-
+	public async run(interaction: ModalSubmitInteraction, userId: InteractionHandler.ParseResult<this>) {
 		const input = interaction.fields.getTextInputValue('SafetyContext');
 
-		await this.container.client.users.fetch(process.env.OWNERS)
-			.then(owner => owner.send(input === '' ? 'No context provided' : input));
+		await this.container.client.users.fetch(userId)
+			.then(user => user.send(input === '' ? 'No context provided' : input));
 
 		interaction.reply({
 			content: `${input === '' ? 'No additional context was sent' : 'I\'ve sent that context'}`,
-			ephemeral: true
+			flags: MessageFlags.Ephemeral
 		});
 	}