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

Remove IComparable<IGuildUser>

Browse Source
This commit is contained in:
james7132
2016-10-29 07:50:26 +00:00
parent 50d1aa0689
commit 08c7b49aae
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Core/Entities/Users/IGuildUser.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Discord namespace Discord
{ {
/// <summary> A Guild-User pairing. </summary> /// <summary> A Guild-User pairing. </summary>
public interface IGuildUser : IUser, IVoiceState, IComparable<IGuildUser>, IComparable<IRole> public interface IGuildUser : IUser, IVoiceState, IComparable<IRole>
{ {
/// <summary> Gets when this user joined this guild. </summary> /// <summary> Gets when this user joined this guild. </summary>
DateTimeOffset? JoinedAt { get; } DateTimeOffset? JoinedAt { get; }

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

@@ -21,7 +21,7 @@ namespace Discord
return user.RoleIds.Select(r => guild.GetRole(r)); 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 // These should never be empty since the everyone role is always present
var r1 = u1.GetRoles().Max(); var r1 = u1.GetRoles().Max();
var r2 = u2.GetRoles().Max(); var r2 = u2.GetRoles().Max();
@@ -29,7 +29,7 @@ namespace Discord
return result != 0 ? result : u1.Id.CompareTo(u2.Id); 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); return user.GetRoles().Max().CompareTo(role);
} }
} }

1
src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs
View File

@@ -97,7 +97,6 @@ namespace Discord.Rest
} }
} }
public int CompareTo(IGuildUser user) => this.Compare(user);
public int CompareTo(IRole role) => this.Compare(role); public int CompareTo(IRole role) => this.Compare(role);
//IVoiceState //IVoiceState

1
src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
View File

@@ -96,7 +96,6 @@ namespace Discord.WebSocket
IGuild IGuildUser.Guild => Guild; IGuild IGuildUser.Guild => Guild;
ulong IGuildUser.GuildId => Guild.Id; ulong IGuildUser.GuildId => Guild.Id;
IReadOnlyCollection<ulong> IGuildUser.RoleIds => RoleIds; IReadOnlyCollection<ulong> IGuildUser.RoleIds => RoleIds;
public int CompareTo(IGuildUser user) => this.Compare(user);
public int CompareTo(IRole role) => this.Compare(role); public int CompareTo(IRole role) => this.Compare(role);
//IUser //IUser