#13

- Added command to allow users to give other users their group
- Shows all groups as options but will not let user add another user if the caller doesn't have the role

Server/commands/giveRole.js

@@ -0,0 +1,52 @@
+const { SlashCommandBuilder } = require('discord.js');
+const { DebugBuilder } = require("../utilities/debugBuilder");
+const log = new DebugBuilder("server", "give-role");
+
+module.exports = {
+	data: new SlashCommandBuilder()
+	.setName('give-role')
+	.setDescription('Use this command to give a role you have to another member.')
+	.addUserOption(option =>
+		option.setName('user')
+			.setDescription('The user you wish to give the role to ')
+			.setRequired(true))
+	.addRoleOption(option =>
+		option.setName('role')
+			.setDescription('The role you wish to give the selected user')
+			.setRequired(true)),
+	example: "give-role",
+	isPrivileged: false,
+	requiresTokens: false,
+	defaultTokenUsage: 0,
+	deferInitialReply: true,
+	/*async autocomplete(interaction) {
+		const focusedValue = interaction.options.getFocused();		
+	},*/
+	async execute(interaction) {
+		try{
+			// The role to give to the user
+			const selectedRole = interaction.options.getRole('role');
+
+			// The user who should be given the role
+			var selectedUser = interaction.options.getUser("user");
+			selectedUser = interaction.guild.members.cache.get(selectedUser.id);
+
+
+			// The user who initiated the command
+			const initUser = interaction.member;
+
+			log.DEBUG("Give Role DEBUG: ", initUser, selectedRole, selectedUser);
+
+			// Check if the user has the role selected
+			if (!initUser.roles.cache.find(role => role.name === selectedRole.name)) return await interaction.editReply(`Sorry ${initUser}, you don't have the group ${selectedRole} and thus you cannot give it to ${selectedUser}`);
+
+			// Give the selected user the role and let both the user and the initiator know
+			await selectedUser.roles.add(selectedRole);
+
+			return await interaction.editReply(`Ok ${initUser}, ${selectedUser} has been given the ${selectedRole} role!`)
+		}catch(err){
+			log.ERROR(err)        
+            //await interaction.reply(err.toString());
+		}
+	}
+};

Server/commands/join.js

@@ -3,7 +3,7 @@ const { SlashCommandBuilder } = require('discord.js');
 const { DebugBuilder } = require("../utilities/debugBuilder");
 const { getMembersInRole, getAllClientIds, filterAutocompleteValues } = require("../utilities/utils");
 const { requestOptions, sendHttpRequest } = require("../utilities/httpRequests");
-const { getOnlineNodes, updateNodeInfo, addNodeConnection, getConnectionByNodeId } = require("../utilities/mysqlHandler");
+const { getOnlineNodes, updateNodeInfo, addNodeConnection, getConnectionByNodeId, getAllConnections } = require("../utilities/mysqlHandler");
 
 // Global Vars
 const log = new DebugBuilder("server", "join");
@@ -13,10 +13,10 @@ const log = new DebugBuilder("server", "join");
  * 
  * @param {*} presetName The preset name to listen to on the client
  * @param {*} channelId The channel ID to join the bot to 
- * @param {*} clientIdsUsed EITHER A collection of clients that are currently connected OR a single discord client ID (NOT dev portal ID) that should be used to join the server with
+ * @param {*} connections EITHER A collection of clients that are currently connected OR a single discord client ID (NOT dev portal ID) that should be used to join the server with
  * @returns 
  */
-async function joinServerWrapper(presetName, channelId, clientIdsUsed) {
+async function joinServerWrapper(presetName, channelId, connections) {
 	// Get nodes online
 	var onlineNodes = await new Promise((recordResolve, recordReject) => {
 		getOnlineNodes((nodeRows) => {
@@ -45,16 +45,16 @@ async function joinServerWrapper(presetName, channelId, clientIdsUsed) {
 	log.DEBUG("All clients: ", Object.keys(availableClientIds));
 
 	var selectedClientId;
-	if (typeof clientIdsUsed === 'string') {
+	if (typeof connections === 'string') {
 		for (const availableClientId of availableClientIds) {
-			if (availableClientId.discordId != clientIdsUsed ) selectedClientId = availableClientId;
+			if (availableClientId.discordId != connections ) selectedClientId = availableClientId;
 		}		
 	}
 	else {
-		log.DEBUG("Client IDs Used: ", clientIdsUsed.keys());
+		log.DEBUG("Open connections: ", connections);
-		for (const usedClientId of clientIdsUsed.keys()) {
+		for (const connection of connections) {
-			log.DEBUG("Used Client ID: ", usedClientId);
+			log.DEBUG("Used Client ID: ", connection);
-			availableClientIds = availableClientIds.filter(cid => cid.discordId != usedClientId);			
+			availableClientIds = availableClientIds.filter(cid => cid.discordId != connection.clientObject.discordId);			
 		}
 
 		log.DEBUG("Available Client IDs: ", availableClientIds);
@@ -134,11 +134,11 @@ module.exports = {
 			const channelId = interaction.member.voice.channel.id;
 			log.DEBUG(`Join requested by: ${interaction.user.username}, to: '${presetName}', in channel: ${channelId} / ${guildId}`);			
 
-			const onlineBots = await getMembersInRole(interaction);
+			const connections = await getAllConnections();
 
-			log.DEBUG("Online Bots: ", onlineBots);
+			log.DEBUG("Current Connections: ", connections);
 
-			const selectedClientId = await joinServerWrapper(presetName, channelId, onlineBots.online);
+			const selectedClientId = await joinServerWrapper(presetName, channelId, connections);
 
 			await interaction.editReply(`Ok, ${interaction.member}. **${selectedClientId.name}** is joining your channel.`);
 			//await interaction.channel.send('**Pong.**'); // This will send a message to the channel of the interaction outside of the initial reply

Server/commands/remove.js

@@ -7,7 +7,7 @@ const log = new DebugBuilder("server", "remove");
 module.exports = {
 	data: new SlashCommandBuilder()
 	.setName('remove')
-	.setDescription('Remove an RSS source by it\' title')
+	.setDescription('Remove an RSS source by it\'s title')
 	.addStringOption(option =>
 		option.setName('title')
 			.setDescription('The title of the source to remove')

Server/utilities/deployCommands.js

@@ -11,14 +11,14 @@ const path = require('node:path');
 const { DebugBuilder } = require("./debugBuilder");
 const log = new DebugBuilder("server", "deployCommands");
 
-const commands = [];
+var commands = [];
 // Grab all the command files from the commands directory you created earlier
 const commandsPath = path.resolve(__dirname, '../commands');
 const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
 
 exports.deploy = (clientId, guildIDs) => {
 	log.DEBUG("Deploying commands for: ", guildIDs);
-	if (Array.isArray(guildIDs)) guildIDs = [guildIDs];
+	if (!Array.isArray(guildIDs)) guildIDs = [guildIDs];
 	// Grab the SlashCommandBuilder#toJSON() output of each command's data for deployment
 	for (const file of commandFiles) {
 		const command = require(`${path.resolve(commandsPath, file)}`);
@@ -48,3 +48,35 @@ exports.deploy = (clientId, guildIDs) => {
 		})()
 	}
 };
+
+/**
+ * Remove all commands for a given bot in a given guild
+ * 
+ * @param {*} clientId The client ID of the bot to remove commands from 
+ * @param {*} guildId The ID of the guild to remove the bot commands from
+ */
+exports.removeAll = (clientId, guildId) => {	
+	if (!Array.isArray(guildId)) guildIDs = [guildId];
+	log.DEBUG("Removing commands for: ", clientId, guildIDs);
+
+	commands = [];
+
+	const rest = new REST({ version: '10' }).setToken(token);
+	for (const guildId of guildIDs){		
+		(async () => {
+			try {
+				log.DEBUG(`Started refreshing ${commands.length} application (/) commands for guild ID: ${guildId}.`);			
+				// The put method is used to fully refresh all commands in the guild with the current set
+				const data = await rest.put(
+					Routes.applicationGuildCommands(clientId, guildId),
+					{ body: commands },
+				);
+
+				log.DEBUG(`Successfully reloaded ${data.length} application (/) commands for guild ID: ${guildId}.`);
+			} catch (error) {
+				// And of course, make sure you catch and log any errors!
+				log.ERROR("ERROR Deploying commands: ", error, "Body from error: ", commands);
+			}
+		})()
+	}
+}