liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bot: use MemberStore in member type reader

Browse Source
This commit is contained in:
Ske 2019-05-08 20:53:01 +02:00
parent 9b49f22048
commit 495edc3c5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.Bot/Utils.cs
View File

@ -75,19 +75,19 @@ namespace PluralKit.Bot
{ {
public override async Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider services) public override async Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider services)
{ {
var conn = services.GetService(typeof(IDbConnection)) as IDbConnection; var members = services.GetRequiredService<MemberStore>();
// If the sender of the command is in a system themselves, // If the sender of the command is in a system themselves,
// then try searching by the member's name // then try searching by the member's name
if (context is PKCommandContext ctx && ctx.SenderSystem != null) if (context is PKCommandContext ctx && ctx.SenderSystem != null)
{ {
var foundByName = await conn.QuerySingleOrDefaultAsync<PKMember>("select * from members where system = @System and lower(name) = lower(@Name)", new { System = ctx.SenderSystem.Id, Name = input }); var foundByName = await members.GetByName(ctx.SenderSystem, input);
if (foundByName != null) return TypeReaderResult.FromSuccess(foundByName); if (foundByName != null) return TypeReaderResult.FromSuccess(foundByName);
} }
// Otherwise, if sender isn't in a system, or no member found by that name, // Otherwise, if sender isn't in a system, or no member found by that name,
// do a standard by-hid search. // do a standard by-hid search.
var foundByHid = await conn.QuerySingleOrDefaultAsync<PKMember>("select * from members where hid = @Hid", new { Hid = input }); var foundByHid = await members.GetByHid(input);
if (foundByHid != null) return TypeReaderResult.FromSuccess(foundByHid); if (foundByHid != null) return TypeReaderResult.FromSuccess(foundByHid);
return TypeReaderResult.FromError(CommandError.ObjectNotFound, "Member not found."); return TypeReaderResult.FromError(CommandError.ObjectNotFound, "Member not found.");
} }