Functional joining and leaving

- Needs to be tested on multiple servers
- Needs to be tested with multiple nodes
#1 #9

server/discordBot/commands/join.mjs

@@ -12,7 +12,16 @@ export const data = new SlashCommandBuilder()
       .setRequired(true)
       .setAutocomplete(true));
 
-export async function autocomplete(interaction) {
+// Exporting other properties
+export const example = "/join";
+export const deferInitialReply = true;
+
+/**
+ * Function to give the user auto-reply suggestions
+ * @param {any} nodeIo The nodeIO server for manipulation of sockets
+ * @param {any} interaction The interaction object
+ */
+export async function autocomplete(nodeIo, interaction) {
   const focusedValue = interaction.options.getFocused();
   const choices = await getAllSystems();
   const filtered = choices.filter(choice => choice.name.startsWith(focusedValue));
@@ -24,14 +33,14 @@ export async function autocomplete(interaction) {
   );
 }
 
-// Exporting other properties
-export const example = "/join";
-export const deferInitialReply = true;
-
-// Exporting execute function
+/**
+ * The function to run when the command is called by a discord user
+ * @param {any} nodeIo The nodeIO server for manipulation of sockets
+ * @param {any} interaction The interaction object
+ */
 export async function execute(nodeIo, interaction) {
   // Check if the user is in a VC
-  if (!interaction.member.voice.channel) { return await interaction.reply({ content: 'You need to enter a voice channel before use the command', ephemeral: true }) }
+  if (!interaction.member.voice.channel) { return await interaction.reply({ content: `<@${interaction.member.id}>, you need to enter a voice channel before use the command`, ephemeral: true }) }
   // Grab the channel if the user is connected to VC
   const channelToJoin = interaction.member.voice.channel;
 
@@ -74,7 +83,7 @@ export async function execute(nodeIo, interaction) {
     // If there are no available nodes, let the user know there are none available
     if (availableNodes.length == 0) {
       // There are no nodes availble for the requested system
-      return await interaction.editReply("The selected system has no available nodes");
+      return await interaction.editReply(`<@${interaction.member.id}>, the selected system has no available nodes`);
     } else if (availableNodes.length == 1) {
       // There is only one node available for the requested system
       // Request the node to join
@@ -94,7 +103,7 @@ export async function execute(nodeIo, interaction) {
 
       // Reply to the user with the button prompts
       const response = await interaction.editReply({
-        content: "Please select the Node you would like to join with this system",
+        content: `<@${interaction.member.id}>, Please select the Node you would like to join with this system`,
         components: [actionRow]
       });
 

server/discordBot/commands/leave.mjs

@@ -0,0 +1,67 @@
+import { SlashCommandBuilder } from 'discord.js';
+import { checkIfNodeIsConnectedToVC, requestBotLeaveServer, getNodeDiscordUsername, getSocketIdByNuid } from '../../modules/socketServerWrappers.mjs';
+
+// Exporting data property
+export const data = new SlashCommandBuilder()
+  .setName('leave')
+  .setDescription('Disconnect a bot from the server')
+  .addStringOption(system =>
+    system.setName('bot')
+      .setDescription('The bot you would like to disconnect')
+      .setRequired(true)
+      .setAutocomplete(true));;
+
+// Exporting other properties
+export const example = "/leave *{Bot Name}*";
+export const deferInitialReply = true;
+
+/**
+ * Function to give the user auto-reply suggestions
+ * @param {any} nodeIo The nodeIO server for manipulation of sockets
+ * @param {any} interaction The interaction object
+ */
+export async function autocomplete(nodeIo, interaction) {
+  const focusedValue = interaction.options.getFocused();
+  const choices = [];
+
+  const openSockets = [...await nodeIo.allSockets()];
+  await Promise.all(openSockets.map(async openSocket => {
+    openSocket = await nodeIo.sockets.sockets.get(openSocket);
+    const connected = await checkIfNodeIsConnectedToVC(nodeIo, interaction.guild.id, openSocket.node.nuid);
+    console.log("Connected:", connected);
+    if (connected) {
+      const username = await getNodeDiscordUsername(openSocket, interaction.guild.id);
+      choices.push({
+        name: username,
+        value: openSocket.node.nuid
+      });
+    }
+  }));
+
+  const filtered = choices.filter(choice => choice.name.startsWith(focusedValue));
+
+  console.log(focusedValue, choices, filtered);
+
+  await interaction.respond(filtered);
+}
+
+/**
+ * The function to run when the command is called by a discord user
+ * @param {any} nodeIo The nodeIO server for manipulation of sockets
+ * @param {any} interaction The interaction object
+ */
+export async function execute(nodeIo, interaction) {
+  try {
+    // Get the requested bot
+    const selectedNode = interaction.options.getString('bot');
+    const socket = await getSocketIdByNuid(nodeIo, selectedNode);
+    console.log("All open sockets:", socket, selectedNode);
+    await requestBotLeaveServer(socket, interaction.guild.id);
+    //await interaction.reply(`**Online Sockets: '${sockets}'**`);
+    await interaction.editReply(`Ok <@${interaction.member.id}>, the bot is leaving shortly`);
+    //await interaction.channel.send('**Pong.**');
+  } catch (err) {
+    console.error(err);
+    // await interaction.reply(err.toString());
+  }
+}

server/discordBot/events/interactionCreate.mjs

@@ -9,7 +9,7 @@ export async function execute(nodeIo, interaction) {
   // Execute autocomplete if the user is checking autocomplete
   if (interaction.isAutocomplete()) {
     console.log("Running autocomplete for command: ", command.data.name);
-    return await command.autocomplete(interaction);
+    return await command.autocomplete(nodeIo, interaction);
   }
 
   // Check if the interaction is a command