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

fix: don't try to parse privacy from v1 JSON model as v2 privacy model

Browse Source
This commit is contained in:
spiral 2022-04-24 14:39:05 -04:00
parent 7aaad288e6
commit 32b41de331
No known key found for this signature in database
GPG Key ID: 244A11E4B0BCF40E
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PluralKit.Core/Models/Patch/MemberPatch.cs
View File

@ -111,7 +111,7 @@ public class MemberPatch: PatchObject
if (isImport)
{
// legacy: used in old export files and APIv1
// legacy: used in old export files
if (o.ContainsKey("prefix") || o.ContainsKey("suffix") && !o.ContainsKey("proxy_tags"))
patch.ProxyTags = new[] { new ProxyTag(o.Value<string>("prefix"), o.Value<string>("suffix")) };
@ -125,7 +125,6 @@ public class MemberPatch: PatchObject
patch.BirthdayPrivacy = patch.ParsePrivacy(o, "birthday_privacy");
if (o.ContainsKey("pronoun_privacy"))
patch.PronounPrivacy = patch.ParsePrivacy(o, "pronoun_privacy");
// if (o.ContainsKey("color_privacy")) member.ColorPrivacy = o.ParsePrivacy("member");
if (o.ContainsKey("metadata_privacy"))
patch.MetadataPrivacy = patch.ParsePrivacy(o, "metadata_privacy");
}
@ -137,7 +136,7 @@ public class MemberPatch: PatchObject
.Where(p => p.Valid)
.ToArray();
if (o.ContainsKey("privacy") && o["privacy"].Type != JTokenType.Null)
if (o.ContainsKey("privacy") && o["privacy"].Type == JTokenType.Object)
{
var privacy = o.Value<JObject>("privacy");