From 7a7fe3e681eca87cde631336c9af565fd6dfe0d7 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Sun, 12 Sep 2021 13:56:26 -0600
Subject: [PATCH] Fix types and property names

---
 .../LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs       | 2 +-
 .../Listings/SchedulesDirectDtos/MetadataScheduleDto.cs     | 5 +++--
 .../LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs         | 2 +-
 .../SchedulesDirect/SchedulesDirectDeserializeTests.cs      | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
index a635c59870..f190817813 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the datetime.
         /// </summary>
         [JsonPropertyName("datetime")]
-        public DateTime? Datetime { get; set; }
+        public DateTime? LineupTimestamp { get; set; }
 
         /// <summary>
         /// Gets or sets the list of lineups.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
index 68fbeec46d..04560ab55d 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -23,13 +24,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the start date.
         /// </summary>
         [JsonPropertyName("startDate")]
-        public string? StartDate { get; set; }
+        public DateTime? StartDate { get; set; }
 
         /// <summary>
         /// Gets or sets the end date.
         /// </summary>
         [JsonPropertyName("endDate")]
-        public string? EndDate { get; set; }
+        public DateTime? EndDate { get; set; }
 
         /// <summary>
         /// Gets or sets the days count.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
index 561f79c5af..afb9994869 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
@@ -36,7 +36,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the current datetime.
         /// </summary>
         [JsonPropertyName("datetime")]
-        public DateTime? DateTime { get; set; }
+        public DateTime? TokenTimestamp { get; set; }
 
         /// <summary>
         /// Gets or sets the response message.
diff --git a/tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs b/tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs
index a494d883ec..3b3e38bd1f 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs
@@ -30,7 +30,7 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv.SchedulesDirect
             Assert.Equal(0, tokenDto!.Code);
             Assert.Equal("OK", tokenDto.Message);
             Assert.Equal("AWS-SD-web.1", tokenDto.ServerId);
-            Assert.Equal(new DateTime(2016, 08, 23, 13, 55, 25, DateTimeKind.Utc), tokenDto.DateTime);
+            Assert.Equal(new DateTime(2016, 08, 23, 13, 55, 25, DateTimeKind.Utc), tokenDto.TokenTimestamp);
             Assert.Equal("f3fca79989cafe7dead71beefedc812b", tokenDto.Token);
         }
 
@@ -47,7 +47,7 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv.SchedulesDirect
             Assert.Equal(3_000, tokenDto!.Code);
             Assert.Equal("Server offline for maintenance.", tokenDto.Message);
             Assert.Equal("20141201.web.1", tokenDto.ServerId);
-            Assert.Equal(new DateTime(2015, 04, 23, 00, 03, 32, DateTimeKind.Utc), tokenDto.DateTime);
+            Assert.Equal(new DateTime(2015, 04, 23, 00, 03, 32, DateTimeKind.Utc), tokenDto.TokenTimestamp);
             Assert.Equal("CAFEDEADBEEFCAFEDEADBEEFCAFEDEADBEEFCAFE", tokenDto.Token);
             Assert.Equal("SERVICE_OFFLINE", tokenDto.Response);
         }
@@ -207,7 +207,7 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv.SchedulesDirect
             Assert.NotNull(lineupsDto);
             Assert.Equal(0, lineupsDto!.Code);
             Assert.Equal("20141201.web.1", lineupsDto.ServerId);
-            Assert.Equal(new DateTime(2015, 04, 17, 14, 22, 17, DateTimeKind.Utc), lineupsDto.Datetime);
+            Assert.Equal(new DateTime(2015, 04, 17, 14, 22, 17, DateTimeKind.Utc), lineupsDto.LineupTimestamp);
             Assert.Equal(5, lineupsDto.Lineups.Count);
             Assert.Equal("GBR-0001317-DEFAULT", lineupsDto.Lineups[0].Lineup);
             Assert.Equal("Freeview - Carlton - LWT (Southeast)", lineupsDto.Lineups[0].Name);