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

A few role color fixes

Browse Source
This commit is contained in:
RogueException
2015-10-13 04:42:21 -03:00
parent bf49a7ff95
commit 3c882cf2e5
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Discord.Net/DiscordClient.API.cs
View File

@@ -652,15 +652,18 @@ namespace Discord
return _api.CreateRole(serverId); return _api.CreateRole(serverId);
} }
public Task EditRole(Role role, string newName) public Task EditRole(string roleId, string name = null, PackedServerPermissions permissions = null, PackedColor color = null, bool? hoist = null)
=> EditRole(role?.ServerId, role?.Id, newName); => EditRole(_roles[roleId], name: name, permissions: permissions, color: color, hoist: hoist);
public Task EditRole(string serverId, string roleId, string name = null, PackedServerPermissions permissions = null, PackedColor color = null, bool? hoist = null) public Task EditRole(Role role, string name = null, PackedServerPermissions permissions = null, PackedColor color = null, bool? hoist = null)
{ {
CheckReady(); CheckReady();
if (serverId == null) throw new NullReferenceException(nameof(serverId)); if (role == null) throw new NullReferenceException(nameof(role));
if (roleId == null) throw new NullReferenceException(nameof(roleId));
return _api.EditRole(serverId, roleId, name: name, permissions: permissions?.RawValue, color: color?.RawValue, hoist: hoist); return _api.EditRole(role.ServerId, role.Id,
name: name ?? role.Name,
permissions: permissions?.RawValue ?? role.Permissions.RawValue,
color: color?.RawValue ?? role.Color.RawValue,
hoist: hoist ?? role.Hoist);
} }
public Task DeleteRole(Role role) public Task DeleteRole(Role role)

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

@@ -38,9 +38,10 @@ namespace Discord
if (_isLocked) if (_isLocked)
throw new InvalidOperationException("Unable to edit cached permissions directly, use Copy() to make an editable copy."); throw new InvalidOperationException("Unable to edit cached permissions directly, use Copy() to make an editable copy.");
uint original = _rawValue;
int bit = 8 * (pos - 1); int bit = 8 * (pos - 1);
uint mask = (uint)((1 << bit) - 1); uint mask = (uint)~(0xFF << bit);
_rawValue = ((uint)value << bit) | (_rawValue & mask); _rawValue = (_rawValue & mask) | ((uint)value << bit);
} }
} }
} }