From 242b5a45ab198ba4ddcfa7cc9adb1c2217b455c7 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 21 Dec 2020 08:12:32 -0700
Subject: [PATCH 1/2] Add JsonDateTimeConverter

---
 .../Json/Converters/JsonDateTimeConverter.cs  | 34 +++++++++++++++++++
 MediaBrowser.Common/Json/JsonDefaults.cs      |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs

diff --git a/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs b/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs
new file mode 100644
index 0000000000..698b161c99
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+    /// <summary>
+    /// Legacy DateTime converter.
+    /// Milliseconds aren't output if zero by default.
+    /// </summary>
+    public class JsonDateTimeConverter : JsonConverter<DateTime>
+    {
+        /// <inheritdoc />
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return reader.GetDateTime();
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            if (value.Ticks % 10_000_000 == 0)
+            {
+                // Remaining ticks value will be 0, manually format.
+                writer.WriteStringValue(value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffZ", CultureInfo.InvariantCulture));
+            }
+            else
+            {
+                writer.WriteStringValue(value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index b76edd2bc7..128cc9d5d0 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -44,6 +44,7 @@ namespace MediaBrowser.Common.Json
             options.Converters.Add(new JsonStringEnumConverter());
             options.Converters.Add(new JsonNullableStructConverterFactory());
             options.Converters.Add(new JsonBoolNumberConverter());
+            options.Converters.Add(new JsonDateTimeConverter());
 
             return options;
         }

From d3b6a24f78d7a70fc61fe0d479be4b5d3d57bd3f Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 21 Dec 2020 08:41:13 -0700
Subject: [PATCH 2/2] Add JsonDateTimeConverter

---
 MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs b/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs
index 698b161c99..73e3a0493d 100644
--- a/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonDateTimeConverter.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Common.Json.Converters
         /// <inheritdoc />
         public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
         {
-            if (value.Ticks % 10_000_000 == 0)
+            if (value.Millisecond == 0)
             {
                 // Remaining ticks value will be 0, manually format.
                 writer.WriteStringValue(value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffZ", CultureInfo.InvariantCulture));