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

Fix per-system member limit being ignored on import

Browse Source
This commit is contained in:
dev-kittens
2020-10-09 14:24:15 +00:00
parent d80d3c5f04
commit 019800f396
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PluralKit.Core/Services/DataFileService.cs
View File

@@ -119,7 +119,9 @@ namespace PluralKit.Core
system = result.System = await _repo.CreateSystem(conn, data.Name); system = result.System = await _repo.CreateSystem(conn, data.Name);
await _repo.AddAccount(conn, system.Id, accountId); await _repo.AddAccount(conn, system.Id, accountId);
} }
var memberLimit = system.MemberLimitOverride ?? Limits.MaxMemberCount;
// Apply system info // Apply system info
var patch = new SystemPatch {Name = data.Name}; var patch = new SystemPatch {Name = data.Name};
if (data.Description != null) patch.Description = data.Description; if (data.Description != null) patch.Description = data.Description;
@@ -135,10 +137,10 @@ namespace PluralKit.Core
// If creating the unmatched members would put us over the member limit, abort before creating any members // If creating the unmatched members would put us over the member limit, abort before creating any members
var memberCountBefore = await _repo.GetSystemMemberCount(conn, system.Id); var memberCountBefore = await _repo.GetSystemMemberCount(conn, system.Id);
var membersToAdd = data.Members.Count(m => imp.IsNewMember(m.Id, m.Name)); var membersToAdd = data.Members.Count(m => imp.IsNewMember(m.Id, m.Name));
if (memberCountBefore + membersToAdd > Limits.MaxMemberCount) if (memberCountBefore + membersToAdd > memberLimit)
{ {
result.Success = false; result.Success = false;
result.Message = $"Import would exceed the maximum number of members ({Limits.MaxMemberCount})."; result.Message = $"Import would exceed the maximum number of members ({memberLimit}).";
return result; return result;
} }