From 988683ab7228ec3668ace5a2256d5ee1d854bbb9 Mon Sep 17 00:00:00 2001 From: Logan Cusano Date: Sun, 26 Mar 2023 15:40:59 -0400 Subject: [PATCH] update bug in getting bot status --- Client/controllers/botController.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Client/controllers/botController.js b/Client/controllers/botController.js index 002dfae..cb39b59 100644 --- a/Client/controllers/botController.js +++ b/Client/controllers/botController.js @@ -13,21 +13,27 @@ const status = require('../commands/status.js'); /** * Get an object of client guilds + * @param req The express request which includes the discord client * @returns */ -function getGuilds() { - return client.guilds.cache.map(guild => guild.id) +function getGuilds(req) { + return req.discordClient.guilds.cache.map(guild => guild.id) } /** * Get Status of the discord process */ exports.getStatus = (req, res) => { - status({guildID: guildID, callback: (statusObj) => { - log.DEBUG("Status Object string: ", statusObj); - if (!statusObj.voiceConnection) return req.sendStatus(201); - return req.sendStatus(202); - }}); + guildIds = getGuilds(req); + var guildStatuses = [] + for (const guildID of guildIds){ + status({guildID: guildID, callback: (statusObj) => { + log.DEBUG("Status Object string: ", statusObj); + if (!statusObj.voiceConnection) guildStatuses.push({ guildID : 201 }); + else guildStatuses.push({ guildID: 202 }) + }}); + } + return req.send(200).json(guildStatuses); } /**