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

feat: go through some TODOs

Browse Source
This commit is contained in:
spiral
2021-11-26 22:02:58 -05:00
parent 04d78e3348
commit 4450ae4214
21 changed files with 193 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs
View File

@@ -104,6 +104,7 @@ public partial class BulkImporter
if (isNewMember)
{
patch.MessageCount = member.Value<int>("message_count");
var newMember = await _repo.CreateMember(_system.Id, patch.Name.Value, _conn);
memberId = newMember.Id;
}

30
PluralKit.Core/Utils/BulkImporter/TupperboxImport.cs
View File

@@ -47,6 +47,20 @@ public partial class BulkImporter
var multipleTags = false;
var name = tupper.Value<string>("name");
var isNewMember = false;
if (!_existingMemberNames.TryGetValue(name, out var memberId))
{
var newMember = await _repo.CreateMember(_system.Id, name, _conn);
memberId = newMember.Id;
isNewMember = true;
_result.Added++;
}
else
{
_result.Modified++;
}
var patch = new MemberPatch();
patch.Name = name;
@@ -63,8 +77,7 @@ public partial class BulkImporter
patch.ProxyTags = tags.ToArray();
}
// todo: && if is new member
if (tupper.ContainsKey("posts")) patch.MessageCount = tupper.Value<int>("posts");
if (tupper.ContainsKey("posts") && isNewMember) patch.MessageCount = tupper.Value<int>("posts");
if (tupper.ContainsKey("show_brackets")) patch.KeepProxy = tupper.Value<bool>("show_brackets");
if (tupper.ContainsKey("birthday") && tupper["birthday"].Type != JTokenType.Null)
{
@@ -100,19 +113,6 @@ public partial class BulkImporter
throw new ImportException($"Field {err.Key} in tupper {name} is invalid.");
}
var isNewMember = false;
if (!_existingMemberNames.TryGetValue(name, out var memberId))
{
var newMember = await _repo.CreateMember(_system.Id, name, _conn);
memberId = newMember.Id;
isNewMember = true;
_result.Added++;
}
else
{
_result.Modified++;
}
_logger.Debug(
"Importing member with identifier {FileId} to system {System} (is creating new member? {IsCreatingNewMember})",
name, _system.Id, isNewMember);