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

fix: better entity resolving in group member endpoints

Browse Source
This commit is contained in:
spiral 2022-04-07 03:48:32 -04:00
parent 36873e08ee
commit 70cf472fb5
No known key found for this signature in database
GPG Key ID: 244A11E4B0BCF40E
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
PluralKit.API/Controllers/PKControllerBase.cs
View File

@ -12,6 +12,9 @@ public class PKControllerBase: ControllerBase
private readonly Regex _shortIdRegex = new("^[a-z]{5}$"); private readonly Regex _shortIdRegex = new("^[a-z]{5}$");
private readonly Regex _snowflakeRegex = new("^[0-9]{17,19}$"); private readonly Regex _snowflakeRegex = new("^[0-9]{17,19}$");
private List<PKMember>? _memberLookupCache { get; set; }
private List<PKGroup>? _groupLookupCache { get; set; }
protected readonly ApiConfig _config; protected readonly ApiConfig _config;
protected readonly IDatabase _db; protected readonly IDatabase _db;
protected readonly ModelRepository _repo; protected readonly ModelRepository _repo;
@ -47,26 +50,54 @@ public class PKControllerBase: ControllerBase
return Task.FromResult<PKSystem?>(null); return Task.FromResult<PKSystem?>(null);
} }
protected Task<PKMember?> ResolveMember(string memberRef) protected async Task<PKMember?> ResolveMember(string memberRef, bool cache = false)
{ {
if (Guid.TryParse(memberRef, out var guid)) if (cache)
return _repo.GetMemberByGuid(guid); {
if (_memberLookupCache == null)
{
HttpContext.Items.TryGetValue("SystemId", out var systemId);
if (systemId == null)
throw new Exception("Authenticated user must not be null to use lookup cache!");
if (_shortIdRegex.IsMatch(memberRef)) _memberLookupCache = await _repo.GetSystemMembers((SystemId)systemId).ToListAsync();
return _repo.GetMemberByHid(memberRef);
return Task.FromResult<PKMember?>(null);
} }
protected Task<PKGroup?> ResolveGroup(string groupRef) return _memberLookupCache.FirstOrDefault(x => x.Hid == memberRef || x.Uuid.ToString() == memberRef);
}
if (Guid.TryParse(memberRef, out var guid))
return await _repo.GetMemberByGuid(guid);
if (_shortIdRegex.IsMatch(memberRef))
return await _repo.GetMemberByHid(memberRef);
return null;
}
protected async Task<PKGroup?> ResolveGroup(string groupRef, bool cache = true)
{ {
if (cache)
{
if (_groupLookupCache == null)
{
HttpContext.Items.TryGetValue("SystemId", out var systemId);
if (systemId == null)
throw new Exception("Authenticated user must not be null to use lookup cache!");
_groupLookupCache = await _repo.GetSystemGroups((SystemId)systemId).ToListAsync();
}
return _groupLookupCache.FirstOrDefault(x => x.Hid == groupRef || x.Uuid.ToString() == groupRef);
}
if (Guid.TryParse(groupRef, out var guid)) if (Guid.TryParse(groupRef, out var guid))
return _repo.GetGroupByGuid(guid); return await _repo.GetGroupByGuid(guid);
if (_shortIdRegex.IsMatch(groupRef)) if (_shortIdRegex.IsMatch(groupRef))
return _repo.GetGroupByHid(groupRef); return await _repo.GetGroupByHid(groupRef);
return Task.FromResult<PKGroup?>(null); return null;
} }
protected LookupContext ContextFor(PKSystem system) protected LookupContext ContextFor(PKSystem system)

12
PluralKit.API/Controllers/v2/GroupMemberControllerV2.cs
View File

@ -53,7 +53,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JmemberRef in memberRefs) foreach (var JmemberRef in memberRefs)
{ {
var memberRef = JmemberRef.Value<string>(); var memberRef = JmemberRef.Value<string>();
var member = await ResolveMember(memberRef); var member = await ResolveMember(memberRef, cache: true);
// todo: have a list of these errors instead of immediately throwing // todo: have a list of these errors instead of immediately throwing
@ -93,7 +93,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JmemberRef in memberRefs) foreach (var JmemberRef in memberRefs)
{ {
var memberRef = JmemberRef.Value<string>(); var memberRef = JmemberRef.Value<string>();
var member = await ResolveMember(memberRef); var member = await ResolveMember(memberRef, cache: true);
if (member == null) if (member == null)
throw Errors.MemberNotFoundWithRef(memberRef); throw Errors.MemberNotFoundWithRef(memberRef);
@ -124,7 +124,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JmemberRef in memberRefs) foreach (var JmemberRef in memberRefs)
{ {
var memberRef = JmemberRef.Value<string>(); var memberRef = JmemberRef.Value<string>();
var member = await ResolveMember(memberRef); var member = await ResolveMember(memberRef, cache: true);
if (member == null) if (member == null)
throw Errors.MemberNotFoundWithRef(memberRef); throw Errors.MemberNotFoundWithRef(memberRef);
@ -182,7 +182,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JgroupRef in groupRefs) foreach (var JgroupRef in groupRefs)
{ {
var groupRef = JgroupRef.Value<string>(); var groupRef = JgroupRef.Value<string>();
var group = await ResolveGroup(groupRef); var group = await ResolveGroup(groupRef, cache: true);
if (group == null) if (group == null)
throw Errors.GroupNotFound; throw Errors.GroupNotFound;
@ -220,7 +220,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JgroupRef in groupRefs) foreach (var JgroupRef in groupRefs)
{ {
var groupRef = JgroupRef.Value<string>(); var groupRef = JgroupRef.Value<string>();
var group = await ResolveGroup(groupRef); var group = await ResolveGroup(groupRef, cache: true);
if (group == null) if (group == null)
throw Errors.GroupNotFoundWithRef(groupRef); throw Errors.GroupNotFoundWithRef(groupRef);
@ -251,7 +251,7 @@ public class GroupMemberControllerV2: PKControllerBase
foreach (var JgroupRef in groupRefs) foreach (var JgroupRef in groupRefs)
{ {
var groupRef = JgroupRef.Value<string>(); var groupRef = JgroupRef.Value<string>();
var group = await ResolveGroup(groupRef); var group = await ResolveGroup(groupRef, cache: true);
if (group == null) if (group == null)
throw Errors.GroupNotFoundWithRef(groupRef); throw Errors.GroupNotFoundWithRef(groupRef);