From 69910dad127b30163c0a96c37a4dca46f4445f17 Mon Sep 17 00:00:00 2001
From: Robert Paciorek <robert@opcode.eu.org>
Date: Tue, 16 Jul 2024 08:02:44 +0000
Subject: [PATCH] fix internal error in GetAvatarByUserId

---
 src/Controllers/Common/ContentController.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Controllers/Common/ContentController.cs b/src/Controllers/Common/ContentController.cs
index 738302c..fd337fe 100644
--- a/src/Controllers/Common/ContentController.cs
+++ b/src/Controllers/Common/ContentController.cs
@@ -446,12 +446,15 @@ public class ContentController : Controller {
     public IActionResult GetAvatarByUserId([FromForm] Guid userId)
     {
         Viking? viking = ctx.Vikings.FirstOrDefault(e => e.Uid == userId);
+        if (viking is null)
+            return Ok(new AvatarData());
+
         AvatarData avatarData = XmlUtil.DeserializeXml<AvatarData>(viking.AvatarSerialized);
-
+        if (avatarData is null)
+            return Ok(new AvatarData());
+        
         avatarData.Id = viking.Id;
-
-        if (viking != null && avatarData != null) return Ok(avatarData);
-        else return Ok(new AvatarData());
+        return Ok(avatarData);
     }
 
     [HttpPost]