feat: public/private lookup flags, consistency

This commit is contained in:
spiral 2021-12-06 00:32:54 -05:00
parent aacf5909a9
commit 455830a2b5
No known key found for this signature in database
GPG key ID: A6059F0CA0E1BD31
16 changed files with 44 additions and 40 deletions

View file

@ -45,9 +45,7 @@ public class EmbedService
var accounts = await _repo.GetSystemAccounts(system.Id);
var users = (await GetUsers(accounts)).Select(x => x.User?.NameAndMention() ?? $"(deleted account {x.Id})");
var memberCount = cctx.MatchPrivateFlag(ctx)
? await _repo.GetSystemMemberCount(system.Id, PrivacyLevel.Public)
: await _repo.GetSystemMemberCount(system.Id);
var memberCount = await _repo.GetSystemMemberCount(system.Id, ctx == LookupContext.ByOwner ? null : PrivacyLevel.Public);
uint color;
try
@ -225,10 +223,8 @@ public class EmbedService
public async Task<Embed> CreateGroupEmbed(Context ctx, PKSystem system, PKGroup target)
{
var pctx = ctx.LookupContextFor(system);
var memberCount = ctx.MatchPrivateFlag(pctx)
? await _repo.GetGroupMemberCount(target.Id, PrivacyLevel.Public)
: await _repo.GetGroupMemberCount(target.Id);
var pctx = ctx.LookupContextFor(system.Id);
var memberCount = await _repo.GetSystemMemberCount(system.Id, pctx == LookupContext.ByOwner ? null : PrivacyLevel.Public);
var nameField = target.Name;
if (system.Name != null)