github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added role order support to permission resolving

Browse Source
This commit is contained in:
RogueException
2015-10-13 05:27:05 -03:00
parent 356bcc2a65
commit 72f8e4f5df
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net/Models/Member.cs
View File

@@ -184,11 +184,12 @@ namespace Discord
if (channel == null) return; if (channel == null) return;
var channelOverwrites = channel.PermissionOverwrites; var channelOverwrites = channel.PermissionOverwrites;
foreach (var serverRole in Roles) var orderedRoles = Roles.OrderBy(x => x.Id);
foreach (var serverRole in orderedRoles)
newPermissions |= serverRole.Permissions.RawValue; newPermissions |= serverRole.Permissions.RawValue;
foreach (var denyRole in channelOverwrites.Where(x => x.Type == PermissionTarget.Role && x.Deny.RawValue != 0 && RoleIds.Contains(x.TargetId))) foreach (var denyRole in channelOverwrites.Where(x => x.Type == PermissionTarget.Role && x.Deny.RawValue != 0 && orderedRoles.Any(y => y.Id == x.TargetId)))
newPermissions &= ~denyRole.Deny.RawValue; newPermissions &= ~denyRole.Deny.RawValue;
foreach (var allowRole in channelOverwrites.Where(x => x.Type == PermissionTarget.Role && x.Allow.RawValue != 0 && RoleIds.Contains(x.TargetId))) foreach (var allowRole in channelOverwrites.Where(x => x.Type == PermissionTarget.Role && x.Allow.RawValue != 0 && orderedRoles.Any(y => y.Id == x.TargetId)))
newPermissions |= allowRole.Allow.RawValue; newPermissions |= allowRole.Allow.RawValue;
foreach (var denyMembers in channelOverwrites.Where(x => x.Type == PermissionTarget.Member && x.TargetId == UserId && x.Deny.RawValue != 0)) foreach (var denyMembers in channelOverwrites.Where(x => x.Type == PermissionTarget.Member && x.TargetId == UserId && x.Deny.RawValue != 0))
newPermissions &= ~denyMembers.Deny.RawValue; newPermissions &= ~denyMembers.Deny.RawValue;

5
src/Discord.Net/Models/Role.cs
View File

@@ -45,6 +45,9 @@ namespace Discord
Permissions.Lock(); Permissions.Lock();
Color = new PackedColor(0); Color = new PackedColor(0);
Color.Lock(); Color.Lock();
if (isEveryone)
Position = int.MinValue;
} }
internal void Update(API.RoleInfo model) internal void Update(API.RoleInfo model)
@@ -53,7 +56,7 @@ namespace Discord
Name = model.Name; Name = model.Name;
if (model.Hoist != null) if (model.Hoist != null)
Hoist = model.Hoist.Value; Hoist = model.Hoist.Value;
if (model.Position != null) if (model.Position != null && !IsEveryone)
Position = model.Position.Value; Position = model.Position.Value;
if (model.Color != null) if (model.Color != null)
Color.SetRawValue(model.Color.Value); Color.SetRawValue(model.Color.Value);