Minor style change

commands/AI/img2img.js

@@ -116,21 +116,14 @@ async function generate(i, prompt, client, b64Img) {
 			const row = new ActionRowBuilder()
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`regenerate${i.user.id}`)
+						.setCustomId(`regenerate${i.user.id}${i.id}`)
 						.setLabel('🔄 Regenerate')
 						.setStyle(ButtonStyle.Primary),
 				);
 
 			await i.editReply({ embeds: [stableEmbed], components: [row], files: [generatedImg] });
 
-			client.once('interactionCreate', async (interactionMenu) => {
+			listenButton(client, i, prompt);
-				if (i.user !== interactionMenu.user) return;
-				if (!interactionMenu.isButton) return;
-				if (interactionMenu.customId === `regenerate${interactionMenu.user.id}`) {
-					await interactionMenu.deferReply();
-					await generate(interactionMenu, prompt, client);
-				}
-			});
 		}
 	}, wait_time);
 }
@@ -151,3 +144,16 @@ async function checkGeneration(url) {
 		return { done: true, image: check.generations[0].img, seed: check.generations[0].seed, worker_id: check.generations[0].worker_id, worker_name: check.generations[0].worker_name };
 	}
 }
+
+async function listenButton(client, interaction, prompt) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `regenerate${interactionMenu.user.id}${interaction.id}`) {
+			await interactionMenu.deferReply();
+			await generate(interactionMenu, prompt, client);
+		}
+	});
+}

commands/AI/txt2img.js

@@ -101,21 +101,14 @@ async function generate(i, prompt, client) {
 			const row = new ActionRowBuilder()
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`regenerate${i.user.id}`)
+						.setCustomId(`regenerate${i.user.id}${i.id}`)
 						.setLabel('🔄 Regenerate')
 						.setStyle(ButtonStyle.Primary),
 				);
 
 			await i.editReply({ embeds: [stableEmbed], components: [row], files: [generatedImg] });
 
-			client.once('interactionCreate', async (interactionMenu) => {
+			listenButton(client, i, prompt);
-				if (i.user !== interactionMenu.user) return;
-				if (!interactionMenu.isButton) return;
-				if (interactionMenu.customId === `regenerate${interactionMenu.user.id}`) {
-					await interactionMenu.deferReply();
-					await generate(interactionMenu, prompt, client);
-				}
-			});
 		}
 	}, wait_time);
 }
@@ -136,3 +129,16 @@ async function checkGeneration(url) {
 		return { done: true, image: check.generations[0].img, seed: check.generations[0].seed, worker_id: check.generations[0].worker_id, worker_name: check.generations[0].worker_name };
 	}
 }
+
+async function listenButton(client, interaction, prompt) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `regenerate${interactionMenu.user.id}${interaction.id}`) {
+			await interactionMenu.deferReply();
+			await generate(interactionMenu, prompt, client);
+		}
+	});
+}

commands/admin/autoresponse.js

@@ -19,13 +19,13 @@ export default {
 		const row = new ActionRowBuilder()
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`yes${interaction.user.id}`)
+					.setCustomId(`yes${interaction.user.id}${interaction.id}`)
 					.setLabel('Yes')
 					.setStyle(ButtonStyle.Primary),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`no${interaction.user.id}`)
+					.setCustomId(`no${interaction.user.id}${interaction.id}`)
 					.setLabel('No')
 					.setStyle(ButtonStyle.Danger),
 			);
@@ -39,11 +39,18 @@ export default {
 			return interaction.editReply({ content: 'Auto response has been enabled.', ephemeral: true });
 		}
 
-		client.on('interactionCreate', async (interactionMenu) => {
+		return listenButton(client, interaction, interaction.user);
-			if (interaction.user !== interactionMenu.user) return;
+	},
-			if (!interactionMenu.isButton) return;
+};
-			interactionMenu.update({ components: [] });
+
-			if (interactionMenu.customId === `yes${interaction.user.id}`) {
+async function listenButton(client, interaction, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `yes${interaction.user.id}${originalId}`) {
 			const body = { serverID: interaction.guild.id, stat: 'disable' };
 			await db.autoresponseStat.update(body, { where: { serverID: interaction.guild.id } });
 			return interaction.editReply({ content: 'Auto response has been disabled.', ephemeral: true });
@@ -52,5 +59,4 @@ export default {
 			return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
 		}
 	});
-	},
+}
-};

commands/admin/bye.js

@@ -25,30 +25,37 @@ export default {
 		const row = new ActionRowBuilder()
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`edit${interaction.user.id}`)
+					.setCustomId(`edit${interaction.user.id}${interaction.id}`)
 					.setLabel('Edit')
 					.setStyle(ButtonStyle.Primary),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`remove${interaction.user.id}`)
+					.setCustomId(`remove${interaction.user.id}${interaction.id}`)
 					.setLabel('Remove')
 					.setStyle(ButtonStyle.Danger),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`nothing${interaction.user.id}`)
+					.setCustomId(`nothing${interaction.user.id}${interaction.id}`)
 					.setLabel('Do nothing')
 					.setStyle(ButtonStyle.Secondary),
 			);
 
 		await interaction.reply({ content: 'The server already has a message set, do you want to edit it or remove it?', components: [row], ephemeral: true });
 
-		client.on('interactionCreate', async (interactionMenu) => {
+		return listenButton(client, interaction, args, interaction.user);
-			if (interaction.user !== interactionMenu.user) return;
+	},
-			if (!interactionMenu.isButton) return;
+};
-			interactionMenu.update({ components: [] });
+
-			if (interactionMenu.customId === `edit${interaction.user.id}`) {
+async function listenButton(client, interaction, args, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, args, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `edit${interaction.user.id}${originalId}`) {
 			if (!args.message) {
 				return interaction.reply({ content: 'You need to input a message for me to edit!', ephemeral: true });
 			}
@@ -56,7 +63,7 @@ export default {
 			await db.leaveChannel.update(body, { where: { guildID: interaction.guild.id } });
 			return interaction.editReply({ content: `The leave message has been set to ${args.message}`, ephemeral: true });
 		}
-			else if (interactionMenu.customId === `remove${interaction.user.id}`) {
+		else if (interactionMenu.customId === `remove${interaction.user.id}${originalId}`) {
 			db.leaveChannel.destroy({ where: { guildID: interaction.guild.id, channelID: interaction.channel.id } });
 			return interaction.editReply({ content: 'The leave message has been deleted.', ephemeral: true });
 		}
@@ -64,5 +71,4 @@ export default {
 			return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
 		}
 	});
-	},
+}
-};

commands/admin/quotation.js

@@ -20,13 +20,13 @@ export default {
 		const row = new ActionRowBuilder()
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`yes${interaction.user.id}`)
+					.setCustomId(`yes${interaction.user.id}${interaction.id}`)
 					.setLabel('Yes')
 					.setStyle(ButtonStyle.Primary),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`no${interaction.user.id}`)
+					.setCustomId(`no${interaction.user.id}${interaction.id}`)
 					.setLabel('No')
 					.setStyle(ButtonStyle.Danger),
 			);
@@ -40,18 +40,23 @@ export default {
 			return interaction.editReply({ content: 'Quotation has been enabled.', ephemeral: true });
 		}
 
-		client.on('interactionCreate', async (interactionMenu) => {
+		return listenButton(client, interaction, interaction.user);
-			if (interaction.user !== interactionMenu.user) return;
+	},
-			if (!interactionMenu.isButton) return;
+};
+
+async function listenButton(client, interaction, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
 		interactionMenu.update({ components: [] });
-			if (interactionMenu.customId === `yes${interaction.user.id}`) {
+
-				const body = { serverID: interaction.guild.id, stat: 'disable' };
+		if (interactionMenu.customId === `yes${interaction.user.id}${originalId}`) {
-				await db.quotationStat.update(body, { where: { serverID: interaction.guild.id } });
+			await db.quotationStat.destroy({ where: { serverID: interaction.guild.id } });
 			return interaction.editReply({ content: 'Quotation has been disabled.', ephemeral: true });
 		}
 		else {
 			return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
 		}
 	});
-	},
+}
-};

commands/admin/tag.js

@@ -77,35 +77,46 @@ export default {
 			const row = new ActionRowBuilder()
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`edit${interaction.user.id}`)
+						.setCustomId(`edit${interaction.user.id}${interaction.id}`)
 						.setLabel('Edit')
 						.setStyle(ButtonStyle.Primary),
 				)
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`remove${interaction.user.id}`)
+						.setCustomId(`remove${interaction.user.id}${interaction.id}`)
 						.setLabel('Remove')
 						.setStyle(ButtonStyle.Danger),
 				)
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`nothing${interaction.user.id}`)
+						.setCustomId(`nothing${interaction.user.id}${interaction.id}`)
 						.setLabel('Do nothing')
 						.setStyle(ButtonStyle.Secondary),
 				);
 
 			await interaction.editReply({ content: 'This tag already exist, do you want to update it, remove it or do nothing?', components: [row], ephemeral: true });
 
+			return listenButton(client, interaction, args, interaction.user);
+		}
+		else {
+			return interaction.editReply(`You are not the owner of this tag, if you think it is problematic ask an admin to remove it by doing ${this.client.commandHandler.prefix[0]}tag ${args.trigger} --remove`);
+		}
+	},
+};
+
+async function listenButton(client, interaction, args, user = interaction.user, originalId = interaction.id) {
 	client.once('interactionCreate', async (interactionMenu) => {
-				if (interaction.user !== interactionMenu.user) return;
+		if (user !== interactionMenu.user) return listenButton(client, interaction, args, user, originalId);
-				if (!interactionMenu.isButton) return;
+		if (!interactionMenu.isButton()) return;
+
 		await interactionMenu.update({ components: [] });
-				if (interactionMenu.customId === `edit${interaction.user.id}`) {
+
+		if (interactionMenu.customId === `edit${interaction.user.id}${originalId}`) {
 			const body = { trigger: args.trigger, response: args.response, ownerID: interaction.user.id, serverID: interaction.guild.id };
-					await db.Tag.update(body, { where: { serverID: interaction.guild.id } });
+			db.Tag.update(body, { where: { serverID: interaction.guild.id } });
 			return interaction.editReply({ content: `The tag ${args.trigger} has been set to ${args.response}`, ephemeral: true });
 		}
-				else if (interactionMenu.customId === `remove${interaction.user.id}`) {
+		else if (interactionMenu.customId === `remove${interaction.user.id}${originalId}`) {
 			db.Tag.destroy({ where: { trigger: args.trigger, serverID: interaction.guild.id } });
 			return interaction.editReply({ content: `The tag ${args.trigger} has been deleted`, ephemeral: true });
 		}
@@ -113,9 +124,4 @@ export default {
 			return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
 		}
 	});
-		}
+}
-		else {
-			return interaction.editReply(`You are not the owner of this tag, if you think it is problematic ask an admin to remove it by doing ${this.client.commandHandler.prefix[0]}tag ${args.trigger} --remove`);
-		}
-	},
-};

commands/admin/welcome.js

@@ -26,30 +26,37 @@ export default {
 		const row = new ActionRowBuilder()
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`edit${interaction.user.id}`)
+					.setCustomId(`edit${interaction.user.id}${interaction.id}`)
 					.setLabel('Edit')
 					.setStyle(ButtonStyle.Primary),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`remove${interaction.user.id}`)
+					.setCustomId(`remove${interaction.user.id}${interaction.id}`)
 					.setLabel('Remove')
 					.setStyle(ButtonStyle.Danger),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`nothing${interaction.user.id}`)
+					.setCustomId(`nothing${interaction.user.id}${interaction.id}`)
 					.setLabel('Do nothing')
 					.setStyle(ButtonStyle.Secondary),
 			);
 
 		await interaction.reply({ content: 'The server already has a message set, do you want to edit it or remove it?', components: [row], ephemeral: true });
 
-		client.on('interactionCreate', async (interactionMenu) => {
+		return listenButton(client, interaction, args, interaction.user);
-			if (interaction.user !== interactionMenu.user) return;
+	},
-			if (!interactionMenu.isButton) return;
+};
-			interactionMenu.update({ components: [] });
+
-			if (interactionMenu.customId === `edit${interaction.user.id}`) {
+async function listenButton(client, interaction, args, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, args, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `edit${interaction.user.id}${originalId}`) {
 			if (!args.message) {
 				return interaction.reply({ content: 'You need to input a message for me to edit!', ephemeral: true });
 			}
@@ -57,7 +64,7 @@ export default {
 			await db.joinChannel.update(body, { where: { guildID: interaction.guild.id } });
 			return interaction.editReply({ content: `The join message has been set to ${args.message}`, ephemeral: true });
 		}
-			else if (interactionMenu.customId === `remove${interaction.user.id}`) {
+		else if (interactionMenu.customId === `remove${interaction.user.id}${originalId}`) {
 			db.joinChannel.destroy({ where: { guildID: interaction.guild.id, channelID: interaction.channel.id } });
 			return interaction.editReply({ content: 'The join message has been deleted.', ephemeral: true });
 		}
@@ -65,5 +72,4 @@ export default {
 			return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
 		}
 	});
-	},
+}
-};

commands/owner/ublacklist.js

@@ -43,24 +43,32 @@ export default {
 			const row = new ActionRowBuilder()
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`yes${interaction.user.id}`)
+						.setCustomId(`yes${interaction.user.id}${interaction.id}`)
 						.setLabel('Yes')
 						.setStyle(ButtonStyle.Primary),
 				)
 				.addComponents(
 					new ButtonBuilder()
-						.setCustomId(`no${interaction.user.id}`)
+						.setCustomId(`no${interaction.user.id}${interaction.id}`)
 						.setLabel('No')
 						.setStyle(ButtonStyle.Danger),
 				);
 
 			await interaction.editReply({ content: 'This user is already blacklisted, do you want to unblacklist him?', ephemeral: true, components: [row] });
 
-			interaction.client.once('interactionCreate', async (interactionMenu) => {
+			return listenButton(client, interaction, command, userid, interaction.user);
-				if (interaction.user !== interactionMenu.user) return;
+		}
-				if (!interactionMenu.isButton) return;
+	},
-				interactionMenu.update({ components: [] });
+};
-				if (interactionMenu.customId === `yes${interaction.user.id}`) {
+
+async function listenButton(client, interaction, command, userid, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, command, userid, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `yes${interaction.user.id}${originalId}`) {
 			Blacklists.destroy({ where: { type:command, uid:userid } });
 			return interaction.editReply(`The following ID have been unblacklisted from ${command}: ${userid}`);
 		}
@@ -68,6 +76,4 @@ export default {
 			return interaction.editReply('No one has been unblacklisted.');
 		}
 	});
-		}
+}
-	},
-};

commands/utility/optout.js

@@ -18,30 +18,37 @@ export default {
 		const row = new ActionRowBuilder()
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`yes${interaction.user.id}`)
+					.setCustomId(`yes${interaction.user.id}${interaction.id}`)
 					.setLabel('Yes')
 					.setStyle(ButtonStyle.Primary),
 			)
 			.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`no${interaction.user.id}`)
+					.setCustomId(`no${interaction.user.id}${interaction.id}`)
 					.setLabel('No')
 					.setStyle(ButtonStyle.Danger),
 			);
 
 		await interaction.reply({ content: 'You are already opt out, do you wish to opt in?', components: [row] });
 
-		client.on('interactionCreate', async (interactionMenu) => {
+		return listenButton(client, interaction, interaction.user);
-			if (interaction.user !== interactionMenu.user) return;
+	},
-			if (!interactionMenu.isButton) return;
+};
-			interactionMenu.update({ components: [] });
+
-			if (interactionMenu.customId === `yes${interaction.user.id}`) {
+
-				await db.optout.destroy({ where: { userID: interaction.user.id } });
+async function listenButton(client, interaction, user = interaction.user, originalId = interaction.id) {
+	client.once('interactionCreate', async (interactionMenu) => {
+		if (user !== interactionMenu.user) return listenButton(client, interaction, user, originalId);
+		if (!interactionMenu.isButton()) return;
+
+		await interactionMenu.update({ components: [] });
+
+		if (interactionMenu.customId === `yes${interaction.user.id}${originalId}`) {
+			db.optout.destroy({ where: { userID: interaction.user.id } });
 			return interaction.editReply('You have successfully been opt in');
 		}
 		else {
 			return interaction.editReply('Nothing has been changed.');
 		}
 	});
-	},
+}
-};

events/client/status.js

@@ -1,3 +1,4 @@
+import { ActivityType } from 'discord.js';
 import game from '../../json/playing.json' assert {type: 'json'};
 import watch from '../../json/watching.json' assert {type: 'json'};
 
@@ -6,33 +7,35 @@ export default {
 	once: true,
 	async execute(client) {
 		// Bot status
-		setStatus();
+		await setStatus();
 		// Change status every 30 minutes
 		setInterval(async () => {
-			setStatus();
+			await setStatus();
 		}, 1800000);
 
 		async function setStatus() {
 			const random = Math.floor((Math.random() * 2));
+			let types, status;
 			// Random "Watching" status taken from json
 			if (random === 0) {
 				console.log('Status type: \x1b[32mWatching\x1b[0m');
 
-				let status = watch[Math.floor((Math.random() * watch.length))];
+				status = watch[Math.floor((Math.random() * watch.length))];
 				status = status + ' | Now with slash commands!';
 				console.log(`Setting status to: ${status}`);
-				client.user.setActivity(status, { type: 'WATCHING' });
+				types = [ ActivityType.Watching ];
 			}
 			// Random "Playing" status taken from json
 			else if (random === 1) {
 				console.log('Status type: \x1b[32mPlaying\x1b[0m');
 
-				let status = game[Math.floor((Math.random() * game.length))];
+				status = game[Math.floor((Math.random() * game.length))];
 				status = status + ' | Now with slash commands!';
 
 				console.log(`Setting status to: ${status}`);
-				client.user.setActivity(status, { type: 'PLAYING' });
+				types = [ ActivityType.Playing, ActivityType.Competing ];
 			}
+			await client.user.setActivity(status, { type: types[Math.floor((Math.random() * types.length))] });
 		}
 	},
 };

utils/rand.js

@@ -65,7 +65,9 @@ export function rand(text, interaction) {
 	const matches = text.matchAll(/\[.*?\]\s?/g);
 
 	for (const match of matches) {
-		if (search(match[0].trim(), variables)) { text = text.replace(match[0].trim(), search(match[0].trim(), variables).value); }
+		if (search(match[0].trim(), variables)) {
+			text = text.replace(match[0].trim(), search(match[0].trim(), variables).value);
+		}
 	}
 
 	return text;