diff --git a/src/Discord.Net.Core/Entities/Users/IGuildUser.cs b/src/Discord.Net.Core/Entities/Users/IGuildUser.cs index 01ce78a24..3808bd435 100644 --- a/src/Discord.Net.Core/Entities/Users/IGuildUser.cs +++ b/src/Discord.Net.Core/Entities/Users/IGuildUser.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Discord { /// A Guild-User pairing. - public interface IGuildUser : IUser, IVoiceState, IComparable, IComparable + public interface IGuildUser : IUser, IVoiceState, IComparable { /// Gets when this user joined this guild. DateTimeOffset? JoinedAt { get; } diff --git a/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs b/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs index b66a75b1f..4067d0b3e 100644 --- a/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs +++ b/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs @@ -21,7 +21,7 @@ namespace Discord return user.RoleIds.Select(r => guild.GetRole(r)); } - internal static int Compare(this IGuildUser u1, IGuildUser u2) { + public static int CompareRoles(this IGuildUser u1, IGuildUser u2) { // These should never be empty since the everyone role is always present var r1 = u1.GetRoles().Max(); var r2 = u2.GetRoles().Max(); @@ -29,7 +29,7 @@ namespace Discord return result != 0 ? result : u1.Id.CompareTo(u2.Id); } - internal static int Compare(this IGuildUser user, IRole role) { + public static int Compare(this IGuildUser user, IRole role) { return user.GetRoles().Max().CompareTo(role); } } diff --git a/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs b/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs index bebd245e6..154307ace 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs @@ -97,7 +97,6 @@ namespace Discord.Rest } } - public int CompareTo(IGuildUser user) => this.Compare(user); public int CompareTo(IRole role) => this.Compare(role); //IVoiceState diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs index 9c8165d30..05ca7aabc 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs @@ -96,7 +96,6 @@ namespace Discord.WebSocket IGuild IGuildUser.Guild => Guild; ulong IGuildUser.GuildId => Guild.Id; IReadOnlyCollection IGuildUser.RoleIds => RoleIds; - public int CompareTo(IGuildUser user) => this.Compare(user); public int CompareTo(IRole role) => this.Compare(role); //IUser