diff --git a/Client/commands/status.js b/Client/commands/status.js index 4eb9ffa..38f2d7e 100644 --- a/Client/commands/status.js +++ b/Client/commands/status.js @@ -2,9 +2,9 @@ const { DebugBuilder } = require("../utilities/debugBuilder.js"); const log = new DebugBuilder("client-bot", "status"); // Modules -const {getVoiceConnection} = require("@discordjs/voice"); +const { status } = require('../controllers/botController'); // Utilities -const {replyToInteraction} = require("../utilities/messageHandler.js"); + const { SlashCommandBuilder } = require('discord.js'); module.exports = { @@ -14,30 +14,6 @@ module.exports = { example: "status", isPrivileged: false, async execute(interaction) { - await this.status({ interaction: interaction }); - } -} - - -exports.status = async function status({interaction= undefined, guildID= undefined, callback = undefined}) { - //if (!interaction && !guildID) // Need error of sorts - if (interaction){ - guildID = interaction.guild.id; - } - const voiceConnection = getVoiceConnection(guildID); - - const statusObj = { - "guildID": guildID, "voiceConnection": voiceConnection - } - - //log.DEBUG('Status Object: ', statusObj); - - // get the status and return it accordingly (message reply / module) - - if (interaction) { - return replyToInteraction(interaction, "Pong! I have Aids and now you do too!"); - } - else { - callback(statusObj); + await status({ interaction: interaction }); } } \ No newline at end of file diff --git a/Client/controllers/botController.js b/Client/controllers/botController.js index b15b187..d1093fe 100644 --- a/Client/controllers/botController.js +++ b/Client/controllers/botController.js @@ -5,11 +5,12 @@ const log = new DebugBuilder("client", "clientController"); const path = require('path'); const fork = require('child_process').fork; const discordBotPath = path.resolve('discord-bot/app.js'); +const {getVoiceConnection} = require("@discordjs/voice"); +const {replyToInteraction} = require("../utilities/messageHandler.js"); // Commands const { ping } = require('../commands/ping.js'); const { join } = require('../commands/join.js'); const { leave } = require('../commands/leave.js'); -const { status } = require('../commands/status.js'); /** * Get an object of client guilds @@ -29,7 +30,7 @@ exports.getStatus = (res, req) => { log.DEBUG("Guild IDs: ", guildIds); var guildStatuses = [] for (const guildID of guildIds){ - status({guildID: guildID, callback: (statusObj) => { + this.status({guildID: guildID, callback: (statusObj) => { log.DEBUG("Status Object string: ", statusObj); if (!statusObj.voiceConnection) guildStatuses.push({ guildID : 201 }); else guildStatuses.push({ guildID: 202 }) @@ -59,4 +60,27 @@ exports.leaveServer = (res, req) => { leave({guildID: guildID, callback: (response) => { return res.sendStatus(202); }}); +} + +exports.status = async function status({interaction= undefined, guildID= undefined, callback = undefined}) { + //if (!interaction && !guildID) // Need error of sorts + if (interaction){ + guildID = interaction.guild.id; + } + const voiceConnection = getVoiceConnection(guildID); + + const statusObj = { + "guildID": guildID, "voiceConnection": voiceConnection + } + + //log.DEBUG('Status Object: ', statusObj); + + // get the status and return it accordingly (message reply / module) + + if (interaction) { + return replyToInteraction(interaction, "Pong! I have Aids and now you do too!"); + } + else { + callback(statusObj); + } } \ No newline at end of file