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

A few FindChannels and FindUsers bugfixes

Browse Source
This commit is contained in:
RogueException
2015-12-07 18:35:45 -04:00
parent 1567f30c5f
commit eb319d1fba
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net/DiscordClient.Channels.cs
View File

@@ -79,16 +79,16 @@ namespace Discord
return _channels[id]; return _channels[id];
} }
/// <summary> Returns all channels with the specified server and name. </summary> /// <summary> Returns all channels with the specified server and name. </summary>
/// <remarks> Name formats supported: Name and #Name. Search is case-insensitive. </remarks> /// <remarks> Name formats supported: Name, #Name and &lt;#Id&gt;. Search is case-insensitive if exactMatch is false.</remarks>
public IEnumerable<Channel> FindChannels(Server server, string name, ChannelType type = null, bool exactMatch = false) public IEnumerable<Channel> FindChannels(Server server, string name, ChannelType type = null, bool exactMatch = false)
{ {
if (server == null) throw new ArgumentNullException(nameof(server)); if (server == null) throw new ArgumentNullException(nameof(server));
if (name == null) throw new ArgumentNullException(nameof(name)); if (name == null) throw new ArgumentNullException(nameof(name));
CheckReady(); CheckReady();
var query = server.Channels.Where(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase)); var query = server.Channels.Where(x => string.Equals(x.Name, name, exactMatch ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase));
if (!exactMatch && name.Length >= 2) if (!exactMatch && name.Length >= 2)
{ {

20
src/Discord.Net/DiscordClient.Users.cs
View File

@@ -154,22 +154,22 @@ namespace Discord
if (discriminator <= 0) throw new ArgumentOutOfRangeException(nameof(discriminator)); if (discriminator <= 0) throw new ArgumentOutOfRangeException(nameof(discriminator));
CheckReady(); CheckReady();
return FindUsers(server, username, discriminator, true).FirstOrDefault(); return FindUsers(server.Members, server.Id, username, discriminator, true).FirstOrDefault();
} }
/// <summary> Returns all users with the specified server and name, along with their server-specific data. </summary> /// <summary> Returns all users with the specified server and name, along with their server-specific data. </summary>
/// <remarks> Name formats supported: Name, @Name and &lt;@Id&gt;. Search is case-insensitive.</remarks> /// <remarks> Name formats supported: Name, @Name and &lt;@Id&gt;. Search is case-insensitive if exactMatch is false.</remarks>
public IEnumerable<User> FindUsers(Server server, string name, short? discriminator = null, bool exactMatch = false) public IEnumerable<User> FindUsers(Server server, string name, bool exactMatch = false)
{ {
if (server == null) throw new ArgumentNullException(nameof(server)); if (server == null) throw new ArgumentNullException(nameof(server));
if (name == null) throw new ArgumentNullException(nameof(name)); if (name == null) throw new ArgumentNullException(nameof(name));
CheckReady(); CheckReady();
return FindUsers(server.Members, server.Id, name, discriminator, exactMatch); return FindUsers(server.Members, server.Id, name, exactMatch: exactMatch);
} }
/// <summary> Returns all users with the specified channel and name, along with their server-specific data. </summary> /// <summary> Returns all users with the specified channel and name, along with their server-specific data. </summary>
/// <remarks> Name formats supported: Name, @Name and &lt;@Id&gt;. Search is case-insensitive.</remarks> /// <remarks> Name formats supported: Name, @Name and &lt;@Id&gt;. Search is case-insensitive if exactMatch is false.</remarks>
public IEnumerable<User> FindUsers(Channel channel, string name, short? discriminator = null, bool exactMatch = false) public IEnumerable<User> FindUsers(Channel channel, string name, bool exactMatch = false)
{ {
if (channel == null) throw new ArgumentNullException(nameof(channel)); if (channel == null) throw new ArgumentNullException(nameof(channel));
if (name == null) throw new ArgumentNullException(nameof(name)); if (name == null) throw new ArgumentNullException(nameof(name));
@@ -180,16 +180,16 @@ namespace Discord
private IEnumerable<User> FindUsers(IEnumerable<User> users, long? serverId, string name, short? discriminator = null, bool exactMatch = false) private IEnumerable<User> FindUsers(IEnumerable<User> users, long? serverId, string name, short? discriminator = null, bool exactMatch = false)
{ {
var query = users.Where(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase)); var query = users.Where(x => string.Equals(x.Name, name, exactMatch ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase));
if (!exactMatch && name.Length >= 2) if (!exactMatch && name.Length >= 2)
{ {
if (name[0] == '<' && name[1] == '@' && name[name.Length - 1] == '>') //Parse mention if (name[0] == '<' && name[1] == '@' && name[name.Length - 1] == '>') //Parse mention
{ {
long id = IdConvert.ToLong(name.Substring(2, name.Length - 3)); long id = IdConvert.ToLong(name.Substring(2, name.Length - 3));
var channel = _users[id, serverId]; var user = _users[id, serverId];
if (channel != null) if (user != null)
query = query.Concat(new User[] { channel }); query = query.Concat(new User[] { user });
} }
else if (name[0] == '@') //If we somehow get text starting with @ but isn't a mention else if (name[0] == '@') //If we somehow get text starting with @ but isn't a mention
{ {