Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix profile display with implicit linked accounts enabled

Browse Source
This commit is contained in:
RaidMax 2021-09-18 22:31:56 -05:00
parent d5f978858d
commit 694431d789
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Application/Meta/ReceivedPenaltyResourceQueryHelper.cs
View File

@ -47,8 +47,8 @@ namespace IW4MAdmin.Application.Meta
.Where(_penalty => _penalty.OffenderId == query.ClientId || .Where(_penalty => _penalty.OffenderId == query.ClientId ||
linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId); linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
var iqIpLinkedPenalties = new List<EFPenalty>().AsQueryable(); IQueryable<EFPenalty> iqIpLinkedPenalties = null;
if (!_appConfig.EnableImplicitAccountLinking) if (!_appConfig.EnableImplicitAccountLinking)
{ {
var usedIps = await ctx.Aliases.AsNoTracking() var usedIps = await ctx.Aliases.AsNoTracking()
@ -64,7 +64,14 @@ namespace IW4MAdmin.Application.Meta
linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId)); linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId));
} }
var penalties = await iqPenalties.Union(iqIpLinkedPenalties) var iqAllPenalties = iqPenalties;
if (iqIpLinkedPenalties != null)
{
iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
}
var penalties = await iqAllPenalties
.Where(_penalty => _penalty.When < query.Before) .Where(_penalty => _penalty.When < query.Before)
.OrderByDescending(_penalty => _penalty.When) .OrderByDescending(_penalty => _penalty.When)
.Take(query.Count) .Take(query.Count)