Browse Source

Removed custom equalities from cached objects

pull/22/merge
RogueException 9 years ago
parent
commit
82254ccec4
5 changed files with 4 additions and 18 deletions
  1. +2
    -2
      src/Discord.Net/Models/Channel.cs
  2. +0
    -3
      src/Discord.Net/Models/Profile.cs
  3. +1
    -8
      src/Discord.Net/Models/Role.cs
  4. +1
    -3
      src/Discord.Net/Models/Server.cs
  5. +0
    -2
      src/Discord.Net/Models/User.cs

+ 2
- 2
src/Discord.Net/Models/Channel.cs View File

@@ -332,11 +332,13 @@ namespace Discord
public Task<Message> 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<Message> 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<Message> 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();
}
}

+ 0
- 3
src/Discord.Net/Models/Profile.cs View File

@@ -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();
}
}

+ 1
- 8
src/Discord.Net/Models/Role.cs View File

@@ -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<object, bool> p)
{
throw new NotImplementedException();
}
}
}

+ 1
- 3
src/Discord.Net/Models/Server.cs View File

@@ -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();
}
}

+ 0
- 2
src/Discord.Net/Models/User.cs View File

@@ -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();
}
}

Loading…
Cancel
Save