From 927f25b47629db756752b8ba1cc99a36c9caabad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?=
 <fandabohacek@gmail.com>
Date: Thu, 30 Dec 2021 00:30:11 +0100
Subject: [PATCH] fix: correctly return results from type converter repository

---
 .../Converters/ITypeConverterRepository.cs                  | 2 +-
 .../NosSmooth.Packets/Converters/TypeConverterRepository.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/NosSmooth.Packets/Converters/ITypeConverterRepository.cs b/Core/NosSmooth.Packets/Converters/ITypeConverterRepository.cs
index e5e1d48..ee576e9 100644
--- a/Core/NosSmooth.Packets/Converters/ITypeConverterRepository.cs
+++ b/Core/NosSmooth.Packets/Converters/ITypeConverterRepository.cs
@@ -45,7 +45,7 @@ public interface ITypeConverterRepository
     /// <param name="obj">The object to serialize.</param>
     /// <param name="builder">The string builder to append to.</param>
     /// <returns>A result that may or may not have succeeded.</returns>
-    public Result Serialize(Type parseType, object obj, PacketStringBuilder builder);
+    public Result Serialize(Type parseType, object? obj, PacketStringBuilder builder);
 
     /// <summary>
     /// Convert the data from the enumerator to the given type.
diff --git a/Core/NosSmooth.Packets/Converters/TypeConverterRepository.cs b/Core/NosSmooth.Packets/Converters/TypeConverterRepository.cs
index 48a8744..9a77e1c 100644
--- a/Core/NosSmooth.Packets/Converters/TypeConverterRepository.cs
+++ b/Core/NosSmooth.Packets/Converters/TypeConverterRepository.cs
@@ -105,7 +105,7 @@ public class TypeConverterRepository : ITypeConverterRepository
             return Result<object?>.FromError(deserializedResult);
         }
 
-        return Result<object?>.FromSuccess(deserializedResult);
+        return Result<object?>.FromSuccess(deserializedResult.Entity);
     }
 
     /// <summary>
@@ -115,7 +115,7 @@ public class TypeConverterRepository : ITypeConverterRepository
     /// <param name="obj">The object to serialize.</param>
     /// <param name="builder">The string builder to append to.</param>
     /// <returns>A result that may or may not have succeeded.</returns>
-    public Result Serialize(Type parseType, object obj, PacketStringBuilder builder)
+    public Result Serialize(Type parseType, object? obj, PacketStringBuilder builder)
     {
         var specialConverter = GetSpecialConverter(parseType);
         if (specialConverter is not null)
@@ -159,7 +159,7 @@ public class TypeConverterRepository : ITypeConverterRepository
                 return Result<TParseType?>.FromError(new DeserializedValueNullError(typeof(TParseType)));
             }
 
-            return (TParseType)deserializeResult.Entity;
+            return (TParseType?)deserializeResult.Entity;
         }
 
         var converterResult = GetTypeConverter<TParseType>();
-- 
2.48.1