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

Minor bugfix

Browse Source
This commit is contained in:
Brandon Smith
2015-08-15 17:02:22 -03:00
parent d657f1be94
commit cdbcfa2a5c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Discord.Net/DiscordClient.cs
View File

@@ -106,7 +106,8 @@ namespace Discord
message.IsMentioningEveryone = extendedModel.IsMentioningEveryone; message.IsMentioningEveryone = extendedModel.IsMentioningEveryone;
message.IsTTS = extendedModel.IsTextToSpeech; message.IsTTS = extendedModel.IsTextToSpeech;
message.MentionIds = extendedModel.Mentions?.Select(x => x.Id)?.ToArray() ?? new string[0]; message.MentionIds = extendedModel.Mentions?.Select(x => x.Id)?.ToArray() ?? new string[0];
message.UserId = extendedModel.Author.Id; if (extendedModel.Author != null)
message.UserId = extendedModel.Author.Id;
message.Timestamp = extendedModel.Timestamp; message.Timestamp = extendedModel.Timestamp;
message.Text = extendedModel.Content; message.Text = extendedModel.Content;
} }
@@ -399,6 +400,9 @@ namespace Discord
} }
public User FindUser(string name, string discriminator) public User FindUser(string name, string discriminator)
{ {
if (name.StartsWith("@"))
name = name.Substring(1);
return _users return _users
.Where(x => .Where(x =>
string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase) && string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase) &&
@@ -410,6 +414,9 @@ namespace Discord
=> FindChannelUser(channel.Id, name); => FindChannelUser(channel.Id, name);
public User FindChannelUser(string channelId, string name) public User FindChannelUser(string channelId, string name)
{ {
if (name.StartsWith("@"))
name = name.Substring(1);
return _users return _users
.Where(x => string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase)) .Where(x => string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase))
.FirstOrDefault(); .FirstOrDefault();
@@ -426,6 +433,9 @@ namespace Discord
public Channel GetChannel(string id) => _channels[id]; public Channel GetChannel(string id) => _channels[id];
public Channel FindChannel(string name) public Channel FindChannel(string name)
{ {
if (name.StartsWith("#"))
name = name.Substring(1);
return _channels return _channels
.Where(x => string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase)) .Where(x => string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase))
.FirstOrDefault(); .FirstOrDefault();
@@ -434,6 +444,9 @@ namespace Discord
=> FindChannel(server.Id, name); => FindChannel(server.Id, name);
public Channel FindChannel(string serverId, string name) public Channel FindChannel(string serverId, string name)
{ {
if (name.StartsWith("#"))
name = name.Substring(1);
return _channels return _channels
.Where(x => .Where(x =>
string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase) && string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase) &&