diff --git a/_list-guilds.js b/_list-guilds.js index 1a85f44..70edcba 100644 --- a/_list-guilds.js +++ b/_list-guilds.js @@ -2,7 +2,7 @@ * Quick and dirty script to list out what guilds the bot is in and optionally leave some. */ -const guildsToLeave = ['1219254855789711432']; +const guildsToLeave = ['1224396616555823124']; const dotenv = require('dotenv').config(); const token = process.env.TOKEN; @@ -15,16 +15,24 @@ const client = new Discord.Client({ }); client.on('ready', async () => { + const guildChecks = []; console.log(`Logged in as ${client.user.tag}`); console.log('Guilds:'); - client.guilds.cache.forEach(async (guild) => { - console.log(` - ${guild.name} (${guild.id})`); - if (guildsToLeave.includes(guild.id)) { - console.log(` Leaving ${guild.name}`); - await guild.leave(); - } + client.guilds.cache.forEach((guild) => { + const p = new Promise((resolve, reject) => { + console.log(` - ${guild.name} (${guild.id})`); + if (guildsToLeave.includes(guild.id)) { + console.log(` Leaving ${guild.name}`); + guild.leave().then(resolve).catch(reject); + } else { + resolve(); + } + }); + guildChecks.push(p); }); console.log('Done.'); + await Promise.all(guildChecks); + console.log('All guilds checked.'); client.destroy(); }); diff --git a/main.js b/main.js index e798340..0d0e695 100644 --- a/main.js +++ b/main.js @@ -50,7 +50,7 @@ client.once('ready', async () => { await fn.avWx.datis.getAllICAOs(); // console.log(JSON.stringify(icaoArray)); statusChannel = await client.channels.fetch(statusChannelId).catch(e => console.error(e)); - await channel.send(`${new Date().toISOString()} -- <@${process.env.ownerId}>\nStartup Sequence Complete`).catch(e => console.error(e)); + await statusChannel.send(`${new Date().toISOString()} -- <@${process.env.ownerId}>\nStartup Sequence Complete`).catch(e => console.error(e)); }); // slash-commands @@ -147,13 +147,13 @@ client.on('messageCreate', message => { }); // Guild Joins and Leaves: -client.on('guildCreate', async guild => { - await statusChannel.send(`I've been added to a new guild: ${guild.name} (${guild.id})`) +client.on('guildCreate', guild => { + statusChannel.send(`I've been added to a new guild: ${guild.name} (${guild.id})`) .catch(e => console.error(e)); }); -client.on('guildDelete', async guild => { - await statusChannel.send(`I've been removed from a guild: ${guild.name} (${guild.id})`) +client.on('guildDelete', guild => { + statusChannel.send(`I've been removed from a guild: ${guild.name} (${guild.id})`) .catch(e => console.error(e)); });