From d908e01e0e82fb9b51e1d252cfe40809083c20ce Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Mon, 7 Aug 2017 04:09:33 -0300
Subject: [PATCH] Temp removed char serializer

---
 src/Discord.Net.Serialization/Extensions/BufferExtensions.cs      | 8 ++++----
 src/Discord.Net.Serialization/Extensions/JsonReaderExtensions.cs  | 2 +-
 .../Json/Converters/Primitives.String.cs                          | 4 ++--
 src/Discord.Net.Serialization/Json/JsonFormat.cs                  | 7 +++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Discord.Net.Serialization/Extensions/BufferExtensions.cs b/src/Discord.Net.Serialization/Extensions/BufferExtensions.cs
index c0b95ba2d..66838880e 100644
--- a/src/Discord.Net.Serialization/Extensions/BufferExtensions.cs
+++ b/src/Discord.Net.Serialization/Extensions/BufferExtensions.cs
@@ -65,13 +65,13 @@ namespace Discord.Serialization
             throw new SerializationException("Failed to parse UInt64");
         }
 
-        public static char ParseChar(this ReadOnlySpan<byte> text)
+        /*public static char ParseChar(this ReadOnlySpan<byte> text)
         {
             string str = ParseString(text);
-            if (str.Length == 1)
-                return str[0];
+            if (char.TryParse(str, out char c))
+                return c;
             throw new SerializationException("Failed to parse Char");
-        }
+        }*/
         public static string ParseString(this ReadOnlySpan<byte> text) => new Utf8String(text).ToString();
 
         public static float ParseSingle(this ReadOnlySpan<byte> text)
diff --git a/src/Discord.Net.Serialization/Extensions/JsonReaderExtensions.cs b/src/Discord.Net.Serialization/Extensions/JsonReaderExtensions.cs
index 7f8a45f61..6c7f72dc0 100644
--- a/src/Discord.Net.Serialization/Extensions/JsonReaderExtensions.cs
+++ b/src/Discord.Net.Serialization/Extensions/JsonReaderExtensions.cs
@@ -17,7 +17,7 @@ namespace Discord.Serialization
         public static uint ParseUInt32(this JsonReader reader) => reader.Value.ParseUInt32();
         public static ulong ParseUInt64(this JsonReader reader) => reader.Value.ParseUInt64();
 
-        public static char ParseChar(this JsonReader reader) => reader.Value.ParseChar();
+        //public static char ParseChar(this JsonReader reader) => reader.Value.ParseChar();
         public static string ParseString(this JsonReader reader) => reader.Value.ParseString();
 
         public static float ParseSingle(this JsonReader reader) => reader.Value.ParseSingle();
diff --git a/src/Discord.Net.Serialization/Json/Converters/Primitives.String.cs b/src/Discord.Net.Serialization/Json/Converters/Primitives.String.cs
index 9f2867899..945df43dd 100644
--- a/src/Discord.Net.Serialization/Json/Converters/Primitives.String.cs
+++ b/src/Discord.Net.Serialization/Json/Converters/Primitives.String.cs
@@ -2,7 +2,7 @@
 
 namespace Discord.Serialization.Json.Converters
 {
-    internal class CharPropertyConverter : IJsonPropertyConverter<char>
+    /*internal class CharPropertyConverter : IJsonPropertyConverter<char>
     {
         public char Read(PropertyMap map, JsonReader reader, bool isTopLevel)
         {
@@ -19,7 +19,7 @@ namespace Discord.Serialization.Json.Converters
             else
                 writer.WriteValue(value.ToString());
         }
-    }
+    }*/
 
     internal class StringPropertyConverter : IJsonPropertyConverter<string>
     {
diff --git a/src/Discord.Net.Serialization/Json/JsonFormat.cs b/src/Discord.Net.Serialization/Json/JsonFormat.cs
index 3048ca97e..f5603becf 100644
--- a/src/Discord.Net.Serialization/Json/JsonFormat.cs
+++ b/src/Discord.Net.Serialization/Json/JsonFormat.cs
@@ -25,8 +25,8 @@ namespace Discord.Serialization.Json
             AddConverter<float, Converters.SinglePropertyConverter>();
             AddConverter<double, Converters.DoublePropertyConverter>();
             AddConverter<decimal, Converters.DecimalPropertyConverter>();
-
-            AddConverter<char, Converters.CharPropertyConverter>();
+            
+            //AddConverter<char, Converters.CharPropertyConverter>(); //char.Parse does not support Json.Net's serialization
             AddConverter<string, Converters.StringPropertyConverter>();
 
             AddConverter<DateTime, Converters.DateTimePropertyConverter>();
@@ -38,9 +38,8 @@ namespace Discord.Serialization.Json
             AddGenericConverter(typeof(List<>), typeof(Converters.ListPropertyConverter<>));
             AddGenericConverter(typeof(Nullable<>), typeof(Converters.NullablePropertyConverter<>));
 
+            //AddGenericConverter(typeof(Converters.EnumPropertyConverter<>), (type, prop) => type.IsEnum); //TODO: Impl Enums
             AddGenericConverter(typeof(Converters.ObjectPropertyConverter<>), (type, prop) => type.IsClass);
-
-            //AddEnumConverter<Converters.EnumPropertyConverter>();
         }
 
         public void AddConverter<TValue, TConverter>()