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

Fix Tupperbox importing birthdays

Browse Source
This commit is contained in:
Ske 2020-03-04 19:49:02 +01:00
parent 35b0659d05
commit c5a91c4575
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,7 +337,9 @@ namespace PluralKit.Core
[JsonProperty("group_id")] public string GroupId; // Not supported by PK [JsonProperty("group_id")] public string GroupId; // Not supported by PK
[JsonProperty("group_pos")] public int? GroupPos; // Not supported by PK [JsonProperty("group_pos")] public int? GroupPos; // Not supported by PK
[JsonIgnore] public bool Valid => Name != null && Brackets != null && Brackets.Count % 2 == 0; [JsonIgnore] public bool Valid =>
Name != null && Brackets != null && Brackets.Count % 2 == 0 &&
(Birthday == null || DateTimeFormats.TimestampExportFormat.Parse(Birthday).Success);
public DataFileMember ToPluralKit(ref string lastSetTag, ref bool multipleTags, ref bool hasGroup) public DataFileMember ToPluralKit(ref string lastSetTag, ref bool multipleTags, ref bool hasGroup)
{ {
@ -355,12 +357,17 @@ namespace PluralKit.Core
for (var i = 0; i < Brackets.Count / 2; i++) for (var i = 0; i < Brackets.Count / 2; i++)
tags.Add(new ProxyTag(Brackets[i * 2], Brackets[i * 2 + 1])); tags.Add(new ProxyTag(Brackets[i * 2], Brackets[i * 2 + 1]));
// Convert birthday from ISO timestamp format to ISO date
var convertedBirthdate = Birthday != null ? DateTimeFormats.DateExportFormat.Format(
LocalDate.FromDateTime(DateTimeFormats.TimestampExportFormat.Parse(Birthday).Value
.ToDateTimeUtc())) : null;
return new DataFileMember return new DataFileMember
{ {
Id = Guid.NewGuid().ToString(), // Note: this is only ever used for lookup purposes Id = Guid.NewGuid().ToString(), // Note: this is only ever used for lookup purposes
Name = Name, Name = Name,
AvatarUrl = AvatarUrl, AvatarUrl = AvatarUrl,
Birthday = Birthday, Birthday = convertedBirthdate,
Description = Description, Description = Description,
ProxyTags = tags, ProxyTags = tags,
KeepProxy = ShowBrackets, KeepProxy = ShowBrackets,