From a06b448f4ac67318aa0fad5b9874bbc35b79ec93 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Sat, 11 Dec 2021 16:50:09 +0200
Subject: [PATCH] Don't use `GetNonWhiteSpaceString()` with nullable JSON
 fields

Fixes #747
---
 DiscordChatExporter.Core/Discord/Data/Channel.cs | 2 +-
 DiscordChatExporter.Core/Discord/Data/Emoji.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DiscordChatExporter.Core/Discord/Data/Channel.cs b/DiscordChatExporter.Core/Discord/Data/Channel.cs
index 3c8c2d14..f13701ee 100644
--- a/DiscordChatExporter.Core/Discord/Data/Channel.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Channel.cs
@@ -45,7 +45,7 @@ public partial record Channel
     public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
         var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
         var kind = (ChannelKind)json.GetProperty("type").GetInt32();
 
diff --git a/DiscordChatExporter.Core/Discord/Data/Emoji.cs b/DiscordChatExporter.Core/Discord/Data/Emoji.cs
index ba8bb533..fd205133 100644
--- a/DiscordChatExporter.Core/Discord/Data/Emoji.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Emoji.cs
@@ -48,7 +48,7 @@ public partial record Emoji
 
     public static Emoji Parse(JsonElement json)
     {
-        var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceString();
+        var id = json.GetPropertyOrNull("id")?.GetStringOrNull();
         var name = json.GetProperty("name").GetNonWhiteSpaceString();
         var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;