matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Handle everyone role having top priority in permission resolution.

Browse Source 
In Discord, if the @everyone role has an explicit allow but a later
role has an explicit deny, the permission is denied rather than allowed
despite the fact that on Discord, allows have a higher priority than
denies.

This is because the @everyone role is supposed to be the first role to
be applied, while the rest could be applied in an aggregate fashion.

Fixes #630.
This commit is contained in:
Rapptz 2017-07-07 17:53:38 -04:00
parent bd67cb5137
commit c2544b9101
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
discord/abc.py
View File

@ -380,12 +380,23 @@ class GuildChannel:
if base.administrator: if base.administrator:
return Permissions.all() return Permissions.all()
# Apply @everyone allow/deny first since it's special
try:
maybe_everyone = self._overwrites[0]
if maybe_everyone.id == self.guild.id:
base.handle_overwrite(allow=maybe_everyone.allow, deny=maybe_everyone.deny)
remaining_overwrites = self._overwrites[1:]
else:
remaining_overwrites = self._overwrites
except IndexError:
remaining_overwrites = self._overwrites
member_role_ids = set(map(lambda r: r.id, member.roles)) member_role_ids = set(map(lambda r: r.id, member.roles))
denies = 0 denies = 0
allows = 0 allows = 0
# Apply channel specific role permission overwrites # Apply channel specific role permission overwrites
for overwrite in self._overwrites: for overwrite in remaining_overwrites:
if overwrite.type == 'role' and overwrite.id in member_role_ids: if overwrite.type == 'role' and overwrite.id in member_role_ids:
denies |= overwrite.deny denies |= overwrite.deny
allows |= overwrite.allow allows |= overwrite.allow
@ -393,7 +404,7 @@ class GuildChannel:
base.handle_overwrite(allow=allows, deny=denies) base.handle_overwrite(allow=allows, deny=denies)
# Apply member specific permission overwrites # Apply member specific permission overwrites
for overwrite in self._overwrites: for overwrite in remaining_overwrites:
if overwrite.type == 'member' and overwrite.id == member.id: if overwrite.type == 'member' and overwrite.id == member.id:
base.handle_overwrite(allow=overwrite.allow, deny=overwrite.deny) base.handle_overwrite(allow=overwrite.allow, deny=overwrite.deny)
break break