From bc23eb84fdc6ff58a6d25d5f27c0ba00c87ba023 Mon Sep 17 00:00:00 2001
From: Anis B <cookie.io@openmailbox.org>
Date: Fri, 1 Dec 2017 02:12:48 +0100
Subject: [PATCH] Fix overwrites order in get_permissions

---
 disco/types/channel.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/disco/types/channel.py b/disco/types/channel.py
index 89f6716..7c563d6 100644
--- a/disco/types/channel.py
+++ b/disco/types/channel.py
@@ -159,12 +159,18 @@ class Channel(SlottedModel, Permissible):
         member = self.guild.get_member(user)
         base = self.guild.get_permissions(member)
 
-        for ow in six.itervalues(self.overwrites):
-            if ow.id != user.id and ow.id not in member.roles:
-                continue
-
-            base -= ow.deny
-            base += ow.allow
+        ow_everyone = self.overwrites.get(self.guild_id)
+        if ow_everyone:
+            base += ow_everyone.compiled
+        
+        for role_id in member.roles:
+            ow_role = self.overwrites.get(role_id)
+            if ow_role:
+                base += ow_role.compiled
+        
+        ow_member = self.overwrites.get(member.user.id)
+        if ow_member:
+            base += ow_member.compiled
 
         return base