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

Added discriminator to User.ToString and Channel.ToString (when private)

Browse Source
This commit is contained in:
RogueException
2015-12-13 23:18:41 -04:00
parent 3e72954c4c
commit 028e012d7e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net/Models/Channel.cs
View File

@@ -123,8 +123,8 @@ namespace Discord
x => _client.Users.GetOrAdd(x, _server.Id), x => _client.Users.GetOrAdd(x, _server.Id),
x => x =>
{ {
Name = "@" + x.Name; Name = $"@{x}";
if (_server.Id == null) if (_server.Id == null)
x.Global.PrivateChannel = this; x.Global.PrivateChannel = this;
}, },
x => x =>

2
src/Discord.Net/Models/User.cs
View File

@@ -281,6 +281,6 @@ namespace Discord
public override bool Equals(object obj) => obj is User && (obj as User).Id == Id; public override bool Equals(object obj) => obj is User && (obj as User).Id == Id;
public override int GetHashCode() => unchecked(Id.GetHashCode() + 7230); public override int GetHashCode() => unchecked(Id.GetHashCode() + 7230);
public override string ToString() => Name ?? IdConvert.ToString(Id); public override string ToString() => Name != null ? $"{Name}#{Discriminator}" : IdConvert.ToString(Id);
} }
} }