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

Fixed variable naming

Browse Source
This commit is contained in:
james7132
2016-10-29 20:36:56 +00:00
parent 2e9bca5b85
commit 89e61fe7d7
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net.Core/Extensions/GuildUserExtensions.cs
View File

@@ -21,12 +21,11 @@ namespace Discord
return user.RoleIds.Select(r => guild.GetRole(r)); return user.RoleIds.Select(r => guild.GetRole(r));
} }
public static int CompareRoles(this IGuildUser u1, IGuildUser u2) { public static int CompareRoles(this IGuildUser left, IGuildUser right) {
// These should never be empty since the everyone role is always present // These should never be empty since the everyone role is always present
var r1 = u1.GetRoles().Max(); var roleLeft = left.GetRoles().Max();
var r2 = u2.GetRoles().Max(); var roleRight= right.GetRoles().Max();
var result = r1.CompareTo(r2); return roleLeft.CompareTo(roleRight);
return result != 0 ? result : u1.Id.CompareTo(u2.Id);
} }
public static int Compare(this IGuildUser user, IRole role) { public static int Compare(this IGuildUser user, IRole role) {

10
src/Discord.Net.Core/Extensions/RoleExtensions.cs
View File

@@ -6,14 +6,16 @@ namespace Discord
{ {
public static class RoleExtensions public static class RoleExtensions
{ {
internal static int Compare(this IRole r1, IRole r2) { internal static int Compare(this IRole left, IRole right) {
if(r2 == null) if(left == null)
return -1;
if(right == null)
return 1; return 1;
var result = r1.Position.CompareTo(r2.Position); var result = left.Position.CompareTo(right.Position);
// As per Discord's documentation, a tie is broken by ID // As per Discord's documentation, a tie is broken by ID
if(result != 0) if(result != 0)
return result; return result;
return r1.Id.CompareTo(r2.Id); return left.Id.CompareTo(right.Id);
} }
} }
} }