Merge branch 'dev' into 'main'

Updating env and waiting list

See merge request illegitimate/illegitimate-bot!15

.env.example

@@ -1,6 +1,8 @@
+PRODTOKEN=
 TOKEN=
 MONGOURI=
 DEV=
 CLIENTID=
+DEVID=
 GUILDID=
 HYPIXELAPIKEY=

commands/config.js

@@ -192,9 +192,8 @@ module.exports = {
 			await channel.send({
 				embeds: [{
 					title: "Waiting List",
-					description: "The people below are on the waiting list to join the guild\n" +
-					"They are placed in order of then being accepted into the guild\n" +
-					"Press the button below to refresh the list",
+					description: "The people below were accepted into the guild\n" +
+					"Try to invite them in order.",
 					color: embedColor,
 					footer: {
 						text: interaction.guild.name + " | Developed by @Taken#0002",
@@ -210,7 +209,7 @@ module.exports = {
 						.setCustomId("waitinglistupdate")
 						.setLabel("Update")
 						.setStyle(ButtonStyle.Primary)
-						.setEmoji({ name: "✅" }))
+						.setEmoji({ name: "🔄" }))
 				]
 			});
 			await interaction.reply({ content: "Message sent", ephemeral: true });

deploy-commands.js

@@ -1,6 +1,6 @@
 const { REST, Routes } = require('discord.js');
 const env = require('dotenv').config();
-const token = process.env.TOKEN;
+const token = process.env.PRODTOKEN;
 const clientId = process.env.CLIENTID;
 const guildId = process.env.GUILDID;
 const fs = require('node:fs');
@@ -84,4 +84,4 @@ else if (arg === '--dev') {
 } 
 else if (arg && arg !== '--prod' && arg !== '--dev') {
 	console.log('Invalid argument!');
-}
+}

events/buttons/waitingListUpdate.js

@@ -14,6 +14,7 @@ module.exports = {
 
 		await interaction.deferReply({ ephemeral: true });
 
+		const user = interaction.user;
 		const message = interaction.message;
 		const embed = message.embeds[0];
 		const accepted = await waitinglist.find()
@@ -50,12 +51,16 @@ module.exports = {
 				title: embed.title,
 				description: embed.description,
 				color: embed.color,
-				footer: embed.footer,
+				footer: {
+					text: "Last updated by " + user.username,
+					icon_url: user.avatarURL(),
+				},
 				thumbnail: embed.thumbnail,
 				fields: fields,
+				timestamp: new Date(),
 			}],
 		});
 
 		await interaction.editReply({ content: 'Updated the waiting list', ephemeral: true });
 	}
-}
+}