From 82254ccec4ea3d3350a12a45616761c532776cf2 Mon Sep 17 00:00:00 2001 From: RogueException Date: Mon, 11 Jan 2016 20:22:32 -0400 Subject: [PATCH] Removed custom equalities from cached objects --- src/Discord.Net/Models/Channel.cs | 4 ++-- src/Discord.Net/Models/Profile.cs | 3 --- src/Discord.Net/Models/Role.cs | 9 +-------- src/Discord.Net/Models/Server.cs | 4 +--- src/Discord.Net/Models/User.cs | 2 -- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs index a2d046687..05a382874 100644 --- a/src/Discord.Net/Models/Channel.cs +++ b/src/Discord.Net/Models/Channel.cs @@ -332,11 +332,13 @@ namespace Discord public Task SendMessage(string text) { if (text == null) throw new ArgumentNullException(nameof(text)); + if (text == "") throw new ArgumentException("Value cannot be blank", nameof(text)); return SendMessageInternal(text, false); } public Task SendTTSMessage(string text) { if (text == null) throw new ArgumentNullException(nameof(text)); + if (text == "") throw new ArgumentException("Value cannot be blank", nameof(text)); return SendMessageInternal(text, true); } private async Task SendMessageInternal(string text, bool isTTS) @@ -596,8 +598,6 @@ namespace Discord } #endregion - public override bool Equals(object obj) => obj is Channel && (obj as Channel).Id == Id; - public override int GetHashCode() => unchecked(Id.GetHashCode() + 5658); public override string ToString() => Name ?? Id.ToIdString(); } } diff --git a/src/Discord.Net/Models/Profile.cs b/src/Discord.Net/Models/Profile.cs index 87dc9cc70..c6eeb6657 100644 --- a/src/Discord.Net/Models/Profile.cs +++ b/src/Discord.Net/Models/Profile.cs @@ -75,9 +75,6 @@ namespace Discord } } - public override bool Equals(object obj) - => (obj is Profile && (obj as Profile).Id == Id) || (obj is User && (obj as User).Id == Id); - public override int GetHashCode() => unchecked(Id.GetHashCode() + 2061); public override string ToString() => Id.ToIdString(); } } diff --git a/src/Discord.Net/Models/Role.cs b/src/Discord.Net/Models/Role.cs index 82af792c3..fefe0f0fd 100644 --- a/src/Discord.Net/Models/Role.cs +++ b/src/Discord.Net/Models/Role.cs @@ -117,14 +117,7 @@ namespace Discord try { await Client.ClientAPI.Send(new DeleteRoleRequest(Server.Id, Id)).ConfigureAwait(false); } catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { } } - - public override bool Equals(object obj) => obj is Role && (obj as Role).Id == Id; - public override int GetHashCode() => unchecked(Id.GetHashCode() + 6653); + public override string ToString() => Name ?? Id.ToIdString(); - - internal object Where(Func p) - { - throw new NotImplementedException(); - } } } diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs index e4b2e33cc..c19e23c46 100644 --- a/src/Discord.Net/Models/Server.cs +++ b/src/Discord.Net/Models/Server.cs @@ -498,9 +498,7 @@ namespace Discord public void RequestOfflineUsers() => Client.GatewaySocket.SendRequestMembers(Id, "", 0); #endregion - - public override bool Equals(object obj) => obj is Server && (obj as Server).Id == Id; - public override int GetHashCode() => unchecked(Id.GetHashCode() + 5175); + public override string ToString() => Name ?? Id.ToIdString(); } } diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs index 96d0a5e41..bd3c6ddeb 100644 --- a/src/Discord.Net/Models/User.cs +++ b/src/Discord.Net/Models/User.cs @@ -338,8 +338,6 @@ namespace Discord => Edit(roles: Roles.Except(roles)); #endregion - public override bool Equals(object obj) => obj is User && (obj as User).Id == Id; - public override int GetHashCode() => unchecked(Id.GetHashCode() + 7230); public override string ToString() => Name != null ? $"{Name}#{Discriminator}" : Id.ToIdString(); } } \ No newline at end of file