From c6ea04144d218a6e82043d55cb81a8d3125b61e4 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Mon, 6 Feb 2023 16:11:28 +0200
Subject: [PATCH] Clean up

---
 DiscordChatExporter.Core/Discord/Data/User.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/DiscordChatExporter.Core/Discord/Data/User.cs b/DiscordChatExporter.Core/Discord/Data/User.cs
index ec16f5aa..ed249d5e 100644
--- a/DiscordChatExporter.Core/Discord/Data/User.cs
+++ b/DiscordChatExporter.Core/Discord/Data/User.cs
@@ -40,10 +40,9 @@ public partial record User
         var discriminator = json.GetProperty("discriminator").GetNonWhiteSpaceString().Pipe(int.Parse);
         var name = json.GetProperty("username").GetNonNullString();
 
-        var avatarHash = json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull();
-        var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
-            ? GetAvatarUrl(id, avatarHash)
-            : GetDefaultAvatarUrl(discriminator);
+        var avatarUrl =
+            json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull()?.Pipe(h => GetAvatarUrl(id, h)) ??
+            GetDefaultAvatarUrl(discriminator);
 
         return new User(id, isBot, discriminator, name, avatarUrl);
     }