From 6365e0a080d7ae6f4158f62df344b41a8a9f50cc Mon Sep 17 00:00:00 2001 From: Lucas LaBuff Date: Fri, 19 Mar 2021 10:58:28 -0400 Subject: [PATCH] Fix JSON discriminator and nickname fields (#524) --- DiscordChatExporter.Core/Discord/Data/User.cs | 4 +++- .../Exporting/Writers/JsonMessageWriter.cs | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DiscordChatExporter.Core/Discord/Data/User.cs b/DiscordChatExporter.Core/Discord/Data/User.cs index 637f4b9c..2772037e 100644 --- a/DiscordChatExporter.Core/Discord/Data/User.cs +++ b/DiscordChatExporter.Core/Discord/Data/User.cs @@ -15,9 +15,11 @@ namespace DiscordChatExporter.Core.Discord.Data public int Discriminator { get; } + public string DiscriminatorFormatted => $"{Discriminator:0000}"; + public string Name { get; } - public string FullName => $"{Name}#{Discriminator:0000}"; + public string FullName => $"{Name}#{DiscriminatorFormatted}"; public string AvatarUrl { get; } diff --git a/DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs b/DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs index c9ef1e08..1da2b524 100644 --- a/DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs +++ b/DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs @@ -169,7 +169,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers _writer.WriteString("id", mentionedUser.Id.ToString()); _writer.WriteString("name", mentionedUser.Name); - _writer.WriteNumber("discriminator", mentionedUser.Discriminator); + _writer.WriteString("discriminator", mentionedUser.DiscriminatorFormatted); _writer.WriteString("nickname", Context.TryGetMember(mentionedUser.Id)?.Nick ?? mentionedUser.Name); _writer.WriteBoolean("isBot", mentionedUser.IsBot); @@ -228,7 +228,8 @@ namespace DiscordChatExporter.Core.Exporting.Writers _writer.WriteStartObject("author"); _writer.WriteString("id", message.Author.Id.ToString()); _writer.WriteString("name", message.Author.Name); - _writer.WriteString("discriminator", $"{message.Author.Discriminator:0000}"); + _writer.WriteString("discriminator", message.Author.DiscriminatorFormatted); + _writer.WriteString("nickname", Context.TryGetMember(message.Author.Id)?.Nick ?? message.Author.Name); _writer.WriteBoolean("isBot", message.Author.IsBot); _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl)); _writer.WriteEndObject();