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

Refactor and simplify member list code

Browse Source
This commit is contained in:
Ske
2020-07-07 20:57:22 +02:00
parent 299f6b2edf
commit 467b95b1b1
10 changed files with 367 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
PluralKit.Bot/Commands/SystemList.cs
View File

@@ -1,4 +1,3 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -22,52 +21,23 @@ namespace PluralKit.Bot
if (target == null) throw Errors.NoSystemError;
ctx.CheckSystemPrivacy(target, target.MemberListPrivacy);
// Must match full before calling the other flag parsers to make sure we consume the token before trying to match search terms, etc
var isFull = ctx.Match("f", "full", "big", "details", "long") || ctx.MatchFlag("f", "full");
var opts = GetOptions(ctx, target);
var renderer = GetRendererFor(ctx, isFull, opts);
var members = (await _db.Execute(c => opts.Execute(c, target, ctx.LookupContextFor(target)))).ToList();
await ctx.Paginate(
members.ToAsyncEnumerable(),
members.Count,
renderer.MembersPerPage,
GetEmbedTitle(target, opts),
(eb, ms) =>
{
eb.WithFooter($"{opts.CreateFilterString()}. {members.Count} results.");
renderer.RenderPage(eb, ctx.System?.Zone ?? DateTimeZone.Utc, ms, ctx.LookupContextFor(target));
return Task.CompletedTask;
});
var opts = ctx.ParseMemberListOptions(ctx.LookupContextFor(target));
await ctx.RenderMemberList(ctx.LookupContextFor(target), _db, target.Id, GetEmbedTitle(target, opts), opts);
}
private string GetEmbedTitle(PKSystem target, SortFilterOptions opts)
private string GetEmbedTitle(PKSystem target, MemberListOptions opts)
{
var title = new StringBuilder("Members of ");
if (target.Name != null) title.Append($"{target.Name} (`{target.Hid}`)");
else title.Append($"`{target.Hid}`");
if (target.Name != null)
title.Append($"{target.Name} (`{target.Hid}`)");
else
title.Append($"`{target.Hid}`");
if (opts.Filter != null) title.Append($" matching **{opts.Filter}**");
if (opts.Search != null)
title.Append($" matching **{opts.Search}**");
return title.ToString();
}
private SortFilterOptions GetOptions(Context ctx, PKSystem target)
{
var opts = SortFilterOptions.FromFlags(ctx);
opts.Filter = ctx.RemainderOrNull();
// If we're *explicitly* trying to access non-public members of another system, error
if (opts.PrivacyFilter != PrivacyFilter.PublicOnly && ctx.LookupContextFor(target) != LookupContext.ByOwner)
throw new PKError("You cannot look up private members of another system.");
return opts;
}
private IListRenderer GetRendererFor(Context ctx, bool isLongList, SortFilterOptions opts)
{
if (isLongList)
return new LongRenderer(LongRenderer.MemberFields.FromFlags(ctx, opts));
return new ShortRenderer();
}
}
}