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

refactor: don't DI IDatabase and ModelRepository into bot command classes

Browse Source
This commit is contained in:
spiral
2022-01-22 03:05:01 -05:00
parent 89c44a3482
commit df6a6fcf12
20 changed files with 194 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PluralKit.Bot/Commands/Random.cs
View File

@@ -4,17 +4,13 @@ namespace PluralKit.Bot;
public class Random
{
private readonly IDatabase _db;
private readonly EmbedService _embeds;
private readonly ModelRepository _repo;
private readonly global::System.Random randGen = new();
public Random(EmbedService embeds, IDatabase db, ModelRepository repo)
public Random(EmbedService embeds)
{
_embeds = embeds;
_db = db;
_repo = repo;
}
// todo: get postgresql to return one random member/group instead of querying all members/groups
@@ -23,7 +19,7 @@ public class Random
{
ctx.CheckSystem();
var members = await _repo.GetSystemMembers(ctx.System.Id).ToListAsync();
var members = await ctx.Repository.GetSystemMembers(ctx.System.Id).ToListAsync();
if (!ctx.MatchFlag("all", "a"))
members = members.Where(m => m.MemberVisibility == PrivacyLevel.Public).ToList();
@@ -41,7 +37,7 @@ public class Random
{
ctx.CheckSystem();
var groups = await _repo.GetSystemGroups(ctx.System.Id).ToListAsync();
var groups = await ctx.Repository.GetSystemGroups(ctx.System.Id).ToListAsync();
if (!ctx.MatchFlag("all", "a"))
groups = groups.Where(g => g.Visibility == PrivacyLevel.Public).ToList();
@@ -60,8 +56,7 @@ public class Random
var opts = ctx.ParseListOptions(ctx.DirectLookupContextFor(group.System));
opts.GroupFilter = group.Id;
await using var conn = await _db.Obtain();
var members = await conn.QueryMemberList(ctx.System.Id, opts.ToQueryOptions());
var members = await ctx.Database.Execute(conn => conn.QueryMemberList(ctx.System.Id, opts.ToQueryOptions()));
if (members == null || !members.Any())
throw new PKError(