From 0763a99765c7fa2ac41bd4a1defb4fdb05c69925 Mon Sep 17 00:00:00 2001 From: Tyrrrz Date: Sat, 24 Oct 2020 17:45:54 +0300 Subject: [PATCH] [JSON] Fix incorrect embed color output --- .../Exporting/Writers/JsonMessageWriter.cs | 5 ++--- .../Internal/Extensions/ColorExtensions.cs | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs b/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs index a9f4e011..de675034 100644 --- a/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs +++ b/DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs @@ -1,5 +1,4 @@ -using System.Drawing; -using System.IO; +using System.IO; using System.Text.Json; using System.Threading.Tasks; using DiscordChatExporter.Domain.Discord.Models; @@ -116,7 +115,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers _writer.WriteString("description", FormatMarkdown(embed.Description)); if (embed.Color != null) - _writer.WriteString("color", ColorTranslator.ToHtml(embed.Color.Value)); + _writer.WriteString("color", embed.Color.Value.ToHex()); if (embed.Author != null) await WriteEmbedAuthorAsync(embed.Author); diff --git a/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs b/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs index 53bd71dd..c6ed05d0 100644 --- a/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs +++ b/DiscordChatExporter.Domain/Internal/Extensions/ColorExtensions.cs @@ -9,5 +9,7 @@ namespace DiscordChatExporter.Domain.Internal.Extensions public static Color ResetAlpha(this Color color) => color.WithAlpha(255); public static int ToRgb(this Color color) => color.ToArgb() & 0xffffff; + + public static string ToHex(this Color color) => $"#{color.R:X2}{color.G:X2}{color.B:X2}"; } } \ No newline at end of file