From 35de24399a32c1810eb5f361cf7149f756ae61ce Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 31 Aug 2022 00:40:26 +0100 Subject: [PATCH] feat(arabot): add extra check if guild/user not in cache --- src/scheduled-tasks/verifyUnblock.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/scheduled-tasks/verifyUnblock.ts b/src/scheduled-tasks/verifyUnblock.ts index 351c20e..5af8534 100644 --- a/src/scheduled-tasks/verifyUnblock.ts +++ b/src/scheduled-tasks/verifyUnblock.ts @@ -27,17 +27,23 @@ export class VerifyUnblock extends ScheduledTask { public async run(payload: { userId: string, guildId: string }) { // Get the guild where the user is in - const guild = this.container.client.guilds.cache.get(payload.guildId); + let guild = this.container.client.guilds.cache.get(payload.guildId); if (guild === undefined) { - console.error('verifyUnblock: Guild not found!'); - return; + guild = await this.container.client.guilds.fetch(payload.guildId); + if (guild === undefined) { + console.error('verifyUnblock: Guild not found!'); + return; + } } // Find GuildMember for the user - const user = guild.members.cache.get(payload.userId); + let user = guild.members.cache.get(payload.userId); if (user === undefined) { - console.error('verifyUnblock: GuildMember not found!'); - return; + user = await guild.members.fetch(payload.userId); + if (user === undefined) { + console.error('verifyUnblock: GuildMember not found!'); + return; + } } // Remove the 'verify block' role