Noi/RegexBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed two small issues

Browse source 
-Fixed QueryAsync(ulong, string) returning incorrect type on an ID search
-Fixed database lookups failing for entries that have null values
This commit is contained in:
Noikoio 2017-11-11 18:12:23 -08:00
parent 588c52f9a8
commit 1a001e33c6
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Feature/EntityCache/EntityCache.cs
View file

@ -38,7 +38,7 @@ namespace Noikoio.RegexBot.Feature.EntityCache
Log("No database storage available.").Wait(); Log("No database storage available.").Wait();
} }
} }
public override Task<object> ProcessConfiguration(JToken configSection) => Task.FromResult<object>(null); public override Task<object> ProcessConfiguration(JToken configSection) => Task.FromResult<object>(null);
#region Event handling #region Event handling

11
Feature/EntityCache/UserCacheItem.cs
View file

@ -41,7 +41,7 @@ namespace Noikoio.RegexBot.Feature.EntityCache
/// </summary> /// </summary>
public string Mention => $"<@{_userId}>"; public string Mention => $"<@{_userId}>";
/// <summary> /// <summary>
/// User's cached nickname in the guild, if any. /// User's cached nickname in the guild. May be null.
/// </summary> /// </summary>
public string Nickname => _nickname; public string Nickname => _nickname;
/// <summary> /// <summary>
@ -70,8 +70,8 @@ namespace Noikoio.RegexBot.Feature.EntityCache
_cacheDate = r.GetDateTime(2).ToUniversalTime(); _cacheDate = r.GetDateTime(2).ToUniversalTime();
_username = r.GetString(3); _username = r.GetString(3);
_discriminator = r.GetString(4); _discriminator = r.GetString(4);
_nickname = r.GetString(5); _nickname = r.IsDBNull(5) ? null : r.GetString(5);
_avatarUrl = r.GetString(6); _avatarUrl = r.IsDBNull(6) ? null : r.GetString(6);
} }
public override string ToString() => DisplayName; public override string ToString() => DisplayName;
@ -115,14 +115,15 @@ namespace Noikoio.RegexBot.Feature.EntityCache
/// Attempts to look up the user given a search string. /// Attempts to look up the user given a search string.
/// This string looks up case-insensitive, exact matches of nicknames and usernames. /// This string looks up case-insensitive, exact matches of nicknames and usernames.
/// </summary> /// </summary>
/// <param name="search"></param>
/// <returns>An <see cref="IEnumerable{T}"/> containing zero or more query results, sorted by cache date.</returns> /// <returns>An <see cref="IEnumerable{T}"/> containing zero or more query results, sorted by cache date.</returns>
public static async Task<IEnumerable<UserCacheItem>> QueryAsync(ulong guild, string search) public static async Task<IEnumerable<UserCacheItem>> QueryAsync(ulong guild, string search)
{ {
// Is search just a number? It's an ID. // Is search just a number? It's an ID.
if (ulong.TryParse(search, out var presult)) if (ulong.TryParse(search, out var presult))
{ {
return new UserCacheItem[] { await QueryAsync(guild, presult) }; var r = await QueryAsync(guild, presult);
if (r == null) return new UserCacheItem[0];
else return new UserCacheItem[] { r };
} }
string name; string name;