From 9cdd494db64dbf0d6eb3944b20d9ab3123081180 Mon Sep 17 00:00:00 2001 From: Crawl Date: Sun, 3 Sep 2017 17:41:07 +0200 Subject: [PATCH] Revert "Fix deny administrator edge case bug (#1878)" (#1879) This reverts commit dbe1ae972b481dfb1610f317671c19a29c5e7d45. --- src/structures/GuildChannel.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/structures/GuildChannel.js b/src/structures/GuildChannel.js index f545f6015..16c8ddd87 100644 --- a/src/structures/GuildChannel.js +++ b/src/structures/GuildChannel.js @@ -72,9 +72,6 @@ class GuildChannel extends Channel { const roles = member.roles; for (const role of roles.values()) permissions |= role.permissions; - const admin = Boolean(permissions & Permissions.FLAGS.ADMINISTRATOR); - if (admin) return new Permissions(Permissions.ALL); - const overwrites = this.overwritesFor(member, true, roles); if (overwrites.everyone) { @@ -94,6 +91,9 @@ class GuildChannel extends Channel { permissions |= overwrites.member.allow; } + const admin = Boolean(permissions & Permissions.FLAGS.ADMINISTRATOR); + if (admin) permissions = Permissions.ALL; + return new Permissions(member, permissions); }