From 5f46f14c1b66aca2f982b28b292257360e61eb97 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Sun, 14 Feb 2021 20:22:57 -0500 Subject: [PATCH] Make sure bot is not in any blacklisted guilds on start-up --- Xiao.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Xiao.js b/Xiao.js index 5cf6d143..044c7a13 100644 --- a/Xiao.js +++ b/Xiao.js @@ -94,6 +94,31 @@ client.on('ready', async () => { client.logger.error(`[BLACKLIST] Could not parse blacklist.json:\n${err.stack}`); } + // Make sure bot is not in any blacklisted guilds + for (const id of client.blacklist.guild) { + try { + const guild = await this.client.guilds.fetch(id, false); + await guild.leave(); + client.logger.info(`[BLACKLIST] Left blacklisted guild ${id}.`); + } catch { + client.logger.info(`[BLACKLIST] Failed to leave blacklisted guild ${id}.`); + } + } + + // Make sure bot is not in any guilds owned by a blacklisted user + let guildsLeft = 0; + for (const guild of this.client.guilds.cache.values()) { + if (client.blacklist.user.includes(guild.ownerID)) { + try { + await guild.leave(); + guildsLeft++; + } catch { + client.logger.info(`[BLACKLIST] Failed to leave blacklisted guild ${guild.id}.`); + } + } + } + client.logger.info(`[BLACKLIST] Left ${guildsLeft} guilds owned by blacklisted users.`); + // Import command-leaderboard.json try { const results = client.importCommandLeaderboard();