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

Merge pull request #285 from dev-kittens/fix-import

Browse Source 
fix importing pronouns and message count
This commit is contained in:
Astrid 2021-03-21 13:51:16 +01:00 committed by GitHub
commit 0c35975605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ namespace PluralKit.Core
Pronouns = fileMember.Pronouns, Pronouns = fileMember.Pronouns,
AvatarUrl = fileMember.AvatarUrl, AvatarUrl = fileMember.AvatarUrl,
KeepProxy = fileMember.KeepProxy, KeepProxy = fileMember.KeepProxy,
MessageCount = fileMember.MessageCount,
}; };
if (fileMember.Prefix != null || fileMember.Suffix != null) if (fileMember.Prefix != null || fileMember.Suffix != null)

9
PluralKit.Core/Utils/BulkImporter.cs
View File

@ -80,12 +80,17 @@ namespace PluralKit.Core
if (patch.Name.IsPresent) qb.Variable("name", "@Name"); if (patch.Name.IsPresent) qb.Variable("name", "@Name");
if (patch.DisplayName.IsPresent) qb.Variable("display_name", "@DisplayName"); if (patch.DisplayName.IsPresent) qb.Variable("display_name", "@DisplayName");
if (patch.Description.IsPresent) qb.Variable("description", "@Description"); if (patch.Description.IsPresent) qb.Variable("description", "@Description");
if (patch.Pronouns.IsPresent) qb.Variable("pronouns", "@Pronouns");
if (patch.Color.IsPresent) qb.Variable("color", "@Color"); if (patch.Color.IsPresent) qb.Variable("color", "@Color");
if (patch.AvatarUrl.IsPresent) qb.Variable("avatar_url", "@AvatarUrl"); if (patch.AvatarUrl.IsPresent) qb.Variable("avatar_url", "@AvatarUrl");
if (patch.ProxyTags.IsPresent) qb.Variable("proxy_tags", "@ProxyTags"); if (patch.ProxyTags.IsPresent) qb.Variable("proxy_tags", "@ProxyTags");
if (patch.Birthday.IsPresent) qb.Variable("birthday", "@Birthday"); if (patch.Birthday.IsPresent) qb.Variable("birthday", "@Birthday");
if (patch.KeepProxy.IsPresent) qb.Variable("keep_proxy", "@KeepProxy"); if (patch.KeepProxy.IsPresent) qb.Variable("keep_proxy", "@KeepProxy");
// don't overwrite message count on existing members
if (existingMember == null)
if (patch.MessageCount.IsPresent) qb.Variable("message_count", "@MessageCount");
var newMember = await _conn.QueryFirstAsync<PKMember>(qb.Build("returning *"), var newMember = await _conn.QueryFirstAsync<PKMember>(qb.Build("returning *"),
new new
{ {
@ -94,11 +99,13 @@ namespace PluralKit.Core
Name = patch.Name.Value, Name = patch.Name.Value,
DisplayName = patch.DisplayName.Value, DisplayName = patch.DisplayName.Value,
Description = patch.Description.Value, Description = patch.Description.Value,
Pronouns = patch.Pronouns.Value,
Color = patch.Color.Value, Color = patch.Color.Value,
AvatarUrl = patch.AvatarUrl.Value, AvatarUrl = patch.AvatarUrl.Value,
KeepProxy = patch.KeepProxy.Value, KeepProxy = patch.KeepProxy.Value,
ProxyTags = patch.ProxyTags.Value, ProxyTags = patch.ProxyTags.Value,
Birthday = patch.Birthday.Value Birthday = patch.Birthday.Value,
MessageCount = patch.MessageCount.Value,
}); });
// Log this member ID by the given identifier // Log this member ID by the given identifier