From e455ba1655b3f23cd618803ce523848a29bc9f99 Mon Sep 17 00:00:00 2001 From: ayntee Date: Mon, 25 Jan 2021 15:09:02 +0400 Subject: [PATCH] Revert "refactor(util): use getter instead (#432)" This reverts commit 8d5803c82a5c9e95ba8c4d00e36dc199e7b0673e. --- src/util/permissions.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/util/permissions.ts b/src/util/permissions.ts index 2ceab16f7..b84c74388 100644 --- a/src/util/permissions.ts +++ b/src/util/permissions.ts @@ -52,22 +52,19 @@ export async function botHasPermission( guildID: string, permissions: Permission[], ) { - const member = await cacheHandlers.get("members", botID); - if (!member) return false; - - const guild = member.guild(guildID); + const guild = await cacheHandlers.get("guilds", guildID); if (!guild) return false; - // The owner of a guild has all permissions, therefore, if the bot is the owner of the guild, permissions do not need to be inspected. + // Check if the bot is the owner of the guild, if it is, returns true if (guild.ownerID === botID) return true; - const guildMember = member.guilds.get( + const member = (await cacheHandlers.get("members", botID))?.guilds.get( guildID, ); - if (!guildMember) return false; + if (!member) return false; // The everyone role is not in member.roles - const permissionBits = [...guildMember.roles, guild.id] + const permissionBits = [...member.roles, guild.id] .map((id) => guild.roles.get(id)!) // Remove any edge case undefined .filter((r) => r)