#16

- Server can now choose from IDs in the DB
- Implemented an active system to disable some IDs from being used

client/discordAudioBot/dabWrappers.mjs

@@ -93,11 +93,32 @@ export const checkIfDiscordVCConnected = async (guildId) => {
  * Get the username of the bot in a given guild 
  * (there may be a server nickname given to the bot in a certain guild)
  * @param {string} guildId The guild id to check the connection status in 
- * @returns {string} The username of the bot in the given guild's CV
+ * @returns {string} The username of the bot in the given guild's VC
  */
 export const getDiscordUsername = async (guildId) => {
     console.log("Requested username");
-    if (activeDiscordClient) return (activeDiscordClient.user.username);
+    if (activeDiscordClient) {
+        // Fetch the guild
+        const guild = await client.guilds.fetch(guildId);
+        
+        // Fetch the bot member in the guild
+        const botMember = await guild.members.fetch(client.user.id);
+        
+        // Return bot's nickname if available, otherwise return username
+        return botMember.nickname || botMember.user.username;
+    }
+    else return (undefined);
+}
+
+/**
+ * Get the ID of the currently running bot 
+ * @returns {string} The ID of the active client
+ */
+export const getDiscordID = async () => {
+    console.log("Requested username");
+    if (activeDiscordClient) {
+        return (activeDiscordClient.user.id);
+    }
     else return (undefined);
 }
 

client/modules/socketClient.mjs

@@ -1,5 +1,5 @@
 import { io } from "socket.io-client";
-import { logIntoServerWrapper, nodeCheckStatus, nodeJoinServer, nodeLeaveServer, nodeGetUsername, nodeCheckDiscordClientStatus, nodeCheckCurrentSystem, nodeUpdate } from "./socketClientWrappers.mjs";
+import { logIntoServerWrapper, nodeCheckStatus, nodeJoinServer, nodeLeaveServer, nodeGetUsername, nodeCheckDiscordClientStatus, nodeCheckCurrentSystem, nodeUpdate, nodeGetDiscordID } from "./socketClientWrappers.mjs";
 
 /**
  * Initialize the socket connection with the server, this will handle disconnects within itself
@@ -36,6 +36,9 @@ export const initSocketConnection = async (localNodeConfig) => {
     // Requested to get the discord username in a given guild
     socket.on('node-get-discord-username', nodeGetUsername);
 
+    // Requested to get the ID of the active discord client
+    socket.on('node-get-discord-id', nodeGetDiscordID);
+
     // Requested to check if the node is connected to VC in a given guild
     socket.on('node-check-connected-status', nodeCheckStatus);
 

client/modules/socketClientWrappers.mjs

@@ -1,4 +1,4 @@
-import { checkIfDiscordVCConnected, joinDiscordVC, leaveDiscordVC, getDiscordUsername, checkIfClientIsOpen } from '../discordAudioBot/dabWrappers.mjs';
+import { checkIfDiscordVCConnected, joinDiscordVC, leaveDiscordVC, getDiscordUsername, checkIfClientIsOpen, getDiscordID } from '../discordAudioBot/dabWrappers.mjs';
 import { getCurrentSystem } from '../op25Handler/op25Handler.mjs';
 import { checkForUpdates } from './selfUpdater.mjs';
 
@@ -80,6 +80,15 @@ export const nodeGetUsername = async (guildId, socketCallback) => {
     socketCallback(await getDiscordUsername(guildId));
 }
 
+/**
+ * Get the ID of the active client
+ * @param {any} socketCallback The callback function to return the result to
+ * @callback {any}
+ */
+export const nodeGetDiscordID = async (socketCallback) => {
+    socketCallback(await getDiscordID());
+}
+
 
 /**
  * Check if the local node has an open discord client in any server