summary refs log tree commit diff
path: root/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic
diff options
context:
space:
mode:
Diffstat (limited to 'extra/admin-api/DataMappings/Spacebar.DataMappings.Generic')
-rw-r--r--extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs5
-rw-r--r--extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/User.cs6
2 files changed, 7 insertions, 4 deletions
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs

index 2a61b75a..1693edd3 100644 --- a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs +++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs
@@ -1,3 +1,4 @@ +using System.Text.Json; using Spacebar.Models.Generic; namespace Spacebar.DataMappings.Generic; @@ -13,10 +14,10 @@ public static class MemberExtensions Avatar = string.IsNullOrWhiteSpace(member.Avatar) ? null : member.Avatar, Banner = string.IsNullOrWhiteSpace(member.Banner) ? null : member.Banner, Collectibles = member.Collectibles, - DisplayNameStyles = member.DisplayNameStyles, + DisplayNameStyles = JsonSerializer.Deserialize<DisplayNameStyle>(member.DisplayNameStyles ?? "null"), Bio = string.IsNullOrWhiteSpace(member.Bio) ? null : member.Bio, Nick = string.IsNullOrWhiteSpace(member.Nick) ? null : member.Nick, - Roles = member.Roles.Select(x=>x.Id).ToList() + Roles = member.Roles.Select(x => x.Id).ToList() }; } } \ No newline at end of file diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/User.cs b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/User.cs
index 607af941..95bce884 100644 --- a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/User.cs +++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/User.cs
@@ -1,3 +1,4 @@ +using System.Text.Json; using Spacebar.Models.Generic; namespace Spacebar.DataMappings.Generic; @@ -6,7 +7,8 @@ public static class User { public static PartialUser ToPartialUser(this Models.Db.Models.User user) { - return new PartialUser() { + return new PartialUser() + { Id = user.Id, Discriminator = user.Discriminator, Username = user.Username, @@ -16,7 +18,7 @@ public static class User Banner = user.Banner, Bot = user.Bot, Collectibles = user.Collectibles, - DisplayNameStyles = user.DisplayNameStyles, + DisplayNameStyles = JsonSerializer.Deserialize<DisplayNameStyle>(user.DisplayNameStyles ?? "null"), // GlobalName = x.GlobalName, PrimaryGuild = user.PrimaryGuild, PublicFlags = user.PublicFlags,