Enable nullable for SchedulesDirect

34 files changed, 153 insertions, 213 deletions

diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 8125ed57d..41c3bafa0 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -16,7 +16,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
 using Jellyfin.Extensions.Json;
-using MediaBrowser.Common;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Cryptography;
@@ -34,7 +33,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         private readonly ILogger<SchedulesDirect> _logger;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly SemaphoreSlim _tokenSemaphore = new SemaphoreSlim(1, 1);
-        private readonly IApplicationHost _appHost;
         private readonly ICryptoProvider _cryptoProvider;
 
         private readonly ConcurrentDictionary<string, NameValuePair> _tokens = new ConcurrentDictionary<string, NameValuePair>();
@@ -44,12 +42,10 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         public SchedulesDirect(
             ILogger<SchedulesDirect> logger,
             IHttpClientFactory httpClientFactory,
-            IApplicationHost appHost,
             ICryptoProvider cryptoProvider)
         {
             _logger = logger;
             _httpClientFactory = httpClientFactory;
-            _appHost = appHost;
             _cryptoProvider = cryptoProvider;
         }
 
@@ -120,8 +116,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             using var programRequestOptions = new HttpRequestMessage(HttpMethod.Post, ApiUrl + "/programs");
             programRequestOptions.Headers.TryAddWithoutValidation("token", token);
 
-            var programsID = dailySchedules.SelectMany(d => d.Programs.Select(s => s.ProgramId)).Distinct();
-            programRequestOptions.Content = new StringContent("[\"" + string.Join("\", \"", programsID) + "\"]", Encoding.UTF8, MediaTypeNames.Application.Json);
+            var programIds = dailySchedules.SelectMany(d => d.Programs.Select(s => s.ProgramId)).Distinct();
+            programRequestOptions.Content = new StringContent("[\"" + string.Join("\", \"", programIds) + "\"]", Encoding.UTF8, MediaTypeNames.Application.Json);
 
             using var innerResponse = await Send(programRequestOptions, true, info, cancellationToken).ConfigureAwait(false);
             await using var innerResponseStream = await innerResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
@@ -225,21 +221,21 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             string newID = programId + "T" + startAt.Ticks + "C" + channelId;
 
-            if (programInfo.AudioProperties != null)
+            if (programInfo.AudioProperties.Count != 0)
             {
-                if (programInfo.AudioProperties.Exists(item => string.Equals(item, "atmos", StringComparison.OrdinalIgnoreCase)))
+                if (programInfo.AudioProperties.Contains("atmos", StringComparer.OrdinalIgnoreCase))
                 {
                     audioType = ProgramAudio.Atmos;
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "dd 5.1", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("dd 5.1", StringComparer.OrdinalIgnoreCase))
                 {
                     audioType = ProgramAudio.DolbyDigital;
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "dd", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("dd", StringComparer.OrdinalIgnoreCase))
                 {
                     audioType = ProgramAudio.DolbyDigital;
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "stereo", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("stereo", StringComparer.OrdinalIgnoreCase))
                 {
                     audioType = ProgramAudio.Stereo;
                 }
@@ -520,7 +516,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                             lineups.Add(new NameIdPair
                             {
                                 Name = string.IsNullOrWhiteSpace(lineup.Name) ? lineup.Lineup : lineup.Name,
-                                Id = lineup.Uri[18..]
+                                Id = lineup.Uri?[18..]
                             });
                         }
                     }
@@ -790,7 +786,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             {
                 var channelNumber = GetChannelNumber(channel);
 
-                var station = allStations.Find(item => string.Equals(item.StationId, channel.StationId, StringComparison.OrdinalIgnoreCase))
+                var station = allStations.FirstOrDefault(item => string.Equals(item.StationId, channel.StationId, StringComparison.OrdinalIgnoreCase))
                     ?? new StationDto
                     {
                         StationId = channel.StationId
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs
index b881b307c..95ac996e0 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,24 +11,24 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the city.
         /// </summary>
         [JsonPropertyName("city")]
-        public string City { get; set; }
+        public string? City { get; set; }
 
         /// <summary>
         /// Gets or sets the state.
         /// </summary>
         [JsonPropertyName("state")]
-        public string State { get; set; }
+        public string? State { get; set; }
 
         /// <summary>
         /// Gets or sets the postal code.
         /// </summary>
         [JsonPropertyName("postalCode")]
-        public string Postalcode { get; set; }
+        public string? Postalcode { get; set; }
 
         /// <summary>
         /// Gets or sets the country.
         /// </summary>
         [JsonPropertyName("country")]
-        public string Country { get; set; }
+        public string? Country { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs
index 96b67d1eb..f6251b9ad 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the content.
         /// </summary>
         [JsonPropertyName("content")]
-        public string Content { get; set; }
+        public string? Content { get; set; }
 
         /// <summary>
         /// Gets or sets the lang.
         /// </summary>
         [JsonPropertyName("lang")]
-        public string Lang { get; set; }
+        public string? Lang { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs
index dac6f5f3e..0b7a2c63a 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,36 +11,36 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the billing order.
         /// </summary>
         [JsonPropertyName("billingOrder")]
-        public string BillingOrder { get; set; }
+        public string? BillingOrder { get; set; }
 
         /// <summary>
         /// Gets or sets the role.
         /// </summary>
         [JsonPropertyName("role")]
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
         /// <summary>
         /// Gets or sets the name id.
         /// </summary>
         [JsonPropertyName("nameId")]
-        public string NameId { get; set; }
+        public string? NameId { get; set; }
 
         /// <summary>
         /// Gets or sets the person id.
         /// </summary>
         [JsonPropertyName("personId")]
-        public string PersonId { get; set; }
+        public string? PersonId { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the character name.
         /// </summary>
         [JsonPropertyName("characterName")]
-        public string CharacterName { get; set; }
+        public string? CharacterName { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs
index 8c9c2c1fc..87c327ed8 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,18 +13,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of maps.
         /// </summary>
         [JsonPropertyName("map")]
-        public List<MapDto> Map { get; set; }
+        public IReadOnlyList<MapDto> Map { get; set; } = Array.Empty<MapDto>();
 
         /// <summary>
         /// Gets or sets the list of stations.
         /// </summary>
         [JsonPropertyName("stations")]
-        public List<StationDto> Stations { get; set; }
+        public IReadOnlyList<StationDto> Stations { get; set; } = Array.Empty<StationDto>();
 
         /// <summary>
         /// Gets or sets the metadata.
         /// </summary>
         [JsonPropertyName("metadata")]
-        public MetadataDto Metadata { get; set; }
+        public MetadataDto? Metadata { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs
index 135b5bb08..c19cd2e48 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the body.
         /// </summary>
         [JsonPropertyName("body")]
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
         /// <summary>
         /// Gets or sets the code.
         /// </summary>
         [JsonPropertyName("code")]
-        public string Code { get; set; }
+        public string? Code { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs
index 82d1001c8..f00c9accd 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the billing order.
         /// </summary>
         [JsonPropertyName("billingOrder")]
-        public string BillingOrder { get; set; }
+        public string? BillingOrder { get; set; }
 
         /// <summary>
         /// Gets or sets the role.
         /// </summary>
         [JsonPropertyName("role")]
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
         /// <summary>
         /// Gets or sets the name id.
         /// </summary>
         [JsonPropertyName("nameId")]
-        public string NameId { get; set; }
+        public string? NameId { get; set; }
 
         /// <summary>
         /// Gets or sets the person id.
         /// </summary>
         [JsonPropertyName("personId")]
-        public string PersonId { get; set; }
+        public string? PersonId { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs
index 68876b068..1a371965c 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -11,29 +10,21 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
     public class DayDto
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="DayDto"/> class.
-        /// </summary>
-        public DayDto()
-        {
-            Programs = new List<ProgramDto>();
-        }
-
-        /// <summary>
         /// Gets or sets the station id.
         /// </summary>
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
         /// <summary>
         /// Gets or sets the list of programs.
         /// </summary>
         [JsonPropertyName("programs")]
-        public List<ProgramDto> Programs { get; set; }
+        public IReadOnlyList<ProgramDto> Programs { get; set; } = Array.Empty<ProgramDto>();
 
         /// <summary>
         /// Gets or sets the metadata schedule.
         /// </summary>
         [JsonPropertyName("metadata")]
-        public MetadataScheduleDto Metadata { get; set; }
+        public MetadataScheduleDto? Metadata { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs
index d3e6ff393..ca6ae7fb1 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the description language.
         /// </summary>
         [JsonPropertyName("descriptionLanguage")]
-        public string DescriptionLanguage { get; set; }
+        public string? DescriptionLanguage { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         [JsonPropertyName("description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs
index 04360266c..1577219ed 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the description language.
         /// </summary>
         [JsonPropertyName("descriptionLanguage")]
-        public string DescriptionLanguage { get; set; }
+        public string? DescriptionLanguage { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         [JsonPropertyName("description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs
index 3af36ae96..eaf4a340b 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of description 100.
         /// </summary>
         [JsonPropertyName("description100")]
-        public List<Description100Dto> Description100 { get; set; }
+        public IReadOnlyList<Description100Dto> Description100 { get; set; } = Array.Empty<Description100Dto>();
 
         /// <summary>
         /// Gets or sets the list of description1000.
         /// </summary>
         [JsonPropertyName("description1000")]
-        public List<Description1000Dto> Description1000 { get; set; }
+        public IReadOnlyList<Description1000Dto> Description1000 { get; set; } = Array.Empty<Description1000Dto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs
index c3b2bd9c1..fbdfb1f71 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,6 +11,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the sub type.
         /// </summary>
         [JsonPropertyName("subType")]
-        public string SubType { get; set; }
+        public string? SubType { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs
index 3d8bea362..6852d89d7 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs
index 1fb3decb2..b9844562f 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,24 +13,24 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the headend.
         /// </summary>
         [JsonPropertyName("headend")]
-        public string Headend { get; set; }
+        public string? Headend { get; set; }
 
         /// <summary>
         /// Gets or sets the transport.
         /// </summary>
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
 
         /// <summary>
         /// Gets or sets the location.
         /// </summary>
         [JsonPropertyName("location")]
-        public string Location { get; set; }
+        public string? Location { get; set; }
 
         /// <summary>
         /// Gets or sets the list of lineups.
         /// </summary>
         [JsonPropertyName("lineups")]
-        public List<LineupDto> Lineups { get; set; }
+        public IReadOnlyList<LineupDto> Lineups { get; set; } = Array.Empty<LineupDto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
index 912e680dd..7e554ff1c 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,60 +11,60 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the width.
         /// </summary>
         [JsonPropertyName("width")]
-        public string Width { get; set; }
+        public string? Width { get; set; }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
         [JsonPropertyName("height")]
-        public string Height { get; set; }
+        public string? Height { get; set; }
 
         /// <summary>
         /// Gets or sets the uri.
         /// </summary>
         [JsonPropertyName("uri")]
-        public string Uri { get; set; }
+        public string? Uri { get; set; }
 
         /// <summary>
         /// Gets or sets the size.
         /// </summary>
         [JsonPropertyName("size")]
-        public string Size { get; set; }
+        public string? Size { get; set; }
 
         /// <summary>
         /// Gets or sets the aspect.
         /// </summary>
         [JsonPropertyName("aspect")]
-        public string aspect { get; set; }
+        public string? aspect { get; set; }
 
         /// <summary>
         /// Gets or sets the category.
         /// </summary>
         [JsonPropertyName("category")]
-        public string Category { get; set; }
+        public string? Category { get; set; }
 
         /// <summary>
         /// Gets or sets the text.
         /// </summary>
         [JsonPropertyName("text")]
-        public string Text { get; set; }
+        public string? Text { get; set; }
 
         /// <summary>
         /// Gets or sets the primary.
         /// </summary>
         [JsonPropertyName("primary")]
-        public string Primary { get; set; }
+        public string? Primary { get; set; }
 
         /// <summary>
         /// Gets or sets the tier.
         /// </summary>
         [JsonPropertyName("tier")]
-        public string Tier { get; set; }
+        public string? Tier { get; set; }
 
         /// <summary>
         /// Gets or sets the caption.
         /// </summary>
         [JsonPropertyName("caption")]
-        public CaptionDto Caption { get; set; }
+        public CaptionDto? Caption { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
index 52e920aa6..676e74525 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the linup.
         /// </summary>
         [JsonPropertyName("lineup")]
-        public string Lineup { get; set; }
+        public string? Lineup { get; set; }
 
         /// <summary>
         /// Gets or sets the lineup name.
         /// </summary>
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the transport.
         /// </summary>
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
 
         /// <summary>
         /// Gets or sets the location.
         /// </summary>
         [JsonPropertyName("location")]
-        public string Location { get; set; }
+        public string? Location { get; set; }
 
         /// <summary>
         /// Gets or sets the uri.
         /// </summary>
         [JsonPropertyName("uri")]
-        public string Uri { get; set; }
+        public string? Uri { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
index 15139ba3b..b0ee0ac8e 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -20,18 +19,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the server id.
         /// </summary>
         [JsonPropertyName("serverID")]
-        public string ServerId { get; set; }
+        public string? ServerId { get; set; }
 
         /// <summary>
         /// Gets or sets the datetime.
         /// </summary>
         [JsonPropertyName("datetime")]
-        public string Datetime { get; set; }
+        public string? Datetime { get; set; }
 
         /// <summary>
         /// Gets or sets the list of lineups.
         /// </summary>
         [JsonPropertyName("lineups")]
-        public List<LineupDto> Lineups { get; set; }
+        public IReadOnlyList<LineupDto> Lineups { get; set; } = Array.Empty<LineupDto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs
index 7b235ed7f..fecc55e03 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,7 +11,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the url.
         /// </summary>
         [JsonPropertyName("URL")]
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
         /// <summary>
         /// Gets or sets the height.
@@ -31,6 +29,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the md5.
         /// </summary>
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
index 5140277b2..cc1841c17 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,19 +11,19 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the station id.
         /// </summary>
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
         /// <summary>
         /// Gets or sets the channel.
         /// </summary>
         [JsonPropertyName("channel")]
-        public string Channel { get; set; }
+        public string? Channel { get; set; }
 
         /// <summary>
         /// Gets or sets the logical channel number.
         /// </summary>
         [JsonPropertyName("logicalChannelNumber")]
-        public string LogicalChannelNumber { get; set; }
+        public string? LogicalChannelNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the uhfvhf.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
index 5a3893a35..40faa493c 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,18 +11,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the linup.
         /// </summary>
         [JsonPropertyName("lineup")]
-        public string Lineup { get; set; }
+        public string? Lineup { get; set; }
 
         /// <summary>
         /// Gets or sets the modified timestamp.
         /// </summary>
         [JsonPropertyName("modified")]
-        public string Modified { get; set; }
+        public string? Modified { get; set; }
 
         /// <summary>
         /// Gets or sets the transport.
         /// </summary>
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs
index 4057e9802..843ef9091 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,6 +11,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the gracenote object.
         /// </summary>
         [JsonPropertyName("gracenote")]
-        public GracenoteDto Gracenote { get; set; }
+        public GracenoteDto? Gracenote { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
index 4979296da..68fbeec46 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,25 +11,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the modified timestamp.
         /// </summary>
         [JsonPropertyName("modified")]
-        public string Modified { get; set; }
+        public string? Modified { get; set; }
 
         /// <summary>
         /// Gets or sets the md5.
         /// </summary>
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
         /// <summary>
         /// Gets or sets the start date.
         /// </summary>
         [JsonPropertyName("startDate")]
-        public string StartDate { get; set; }
+        public string? StartDate { get; set; }
 
         /// <summary>
         /// Gets or sets the end date.
         /// </summary>
         [JsonPropertyName("endDate")]
-        public string EndDate { get; set; }
+        public string? EndDate { get; set; }
 
         /// <summary>
         /// Gets or sets the days count.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs
index 48d731d89..31bef423b 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,7 +13,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the year.
         /// </summary>
         [JsonPropertyName("year")]
-        public string Year { get; set; }
+        public string? Year { get; set; }
 
         /// <summary>
         /// Gets or sets the duration.
@@ -26,6 +25,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of quality rating.
         /// </summary>
         [JsonPropertyName("qualityRating")]
-        public List<QualityRatingDto> QualityRating { get; set; }
+        public IReadOnlyList<QualityRatingDto> QualityRating { get; set; } = Array.Empty<QualityRatingDto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs
index 42eddfff2..e8b15dc07 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
index a84c47c12..bfaed1e08 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,85 +13,85 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the audience.
         /// </summary>
         [JsonPropertyName("audience")]
-        public string Audience { get; set; }
+        public string? Audience { get; set; }
 
         /// <summary>
         /// Gets or sets the program id.
         /// </summary>
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
         /// <summary>
         /// Gets or sets the list of titles.
         /// </summary>
         [JsonPropertyName("titles")]
-        public List<TitleDto> Titles { get; set; }
+        public IReadOnlyList<TitleDto> Titles { get; set; } = Array.Empty<TitleDto>();
 
         /// <summary>
         /// Gets or sets the event details object.
         /// </summary>
         [JsonPropertyName("eventDetails")]
-        public EventDetailsDto EventDetails { get; set; }
+        public EventDetailsDto? EventDetails { get; set; }
 
         /// <summary>
         /// Gets or sets the descriptions.
         /// </summary>
         [JsonPropertyName("descriptions")]
-        public DescriptionsProgramDto Descriptions { get; set; }
+        public DescriptionsProgramDto? Descriptions { get; set; }
 
         /// <summary>
         /// Gets or sets the original air date.
         /// </summary>
         [JsonPropertyName("originalAirDate")]
-        public string OriginalAirDate { get; set; }
+        public string? OriginalAirDate { get; set; }
 
         /// <summary>
         /// Gets or sets the list of genres.
         /// </summary>
         [JsonPropertyName("genres")]
-        public List<string> Genres { get; set; }
+        public IReadOnlyList<string> Genres { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the episode title.
         /// </summary>
         [JsonPropertyName("episodeTitle150")]
-        public string EpisodeTitle150 { get; set; }
+        public string? EpisodeTitle150 { get; set; }
 
         /// <summary>
         /// Gets or sets the list of metadata.
         /// </summary>
         [JsonPropertyName("metadata")]
-        public List<MetadataProgramsDto> Metadata { get; set; }
+        public IReadOnlyList<MetadataProgramsDto> Metadata { get; set; } = Array.Empty<MetadataProgramsDto>();
 
         /// <summary>
         /// Gets or sets the list of content raitings.
         /// </summary>
         [JsonPropertyName("contentRating")]
-        public List<ContentRatingDto> ContentRating { get; set; }
+        public IReadOnlyList<ContentRatingDto> ContentRating { get; set; } = Array.Empty<ContentRatingDto>();
 
         /// <summary>
         /// Gets or sets the list of cast.
         /// </summary>
         [JsonPropertyName("cast")]
-        public List<CastDto> Cast { get; set; }
+        public IReadOnlyList<CastDto> Cast { get; set; } = Array.Empty<CastDto>();
 
         /// <summary>
         /// Gets or sets the list of crew.
         /// </summary>
         [JsonPropertyName("crew")]
-        public List<CrewDto> Crew { get; set; }
+        public IReadOnlyList<CrewDto> Crew { get; set; } = Array.Empty<CrewDto>();
 
         /// <summary>
         /// Gets or sets the entity type.
         /// </summary>
         [JsonPropertyName("entityType")]
-        public string EntityType { get; set; }
+        public string? EntityType { get; set; }
 
         /// <summary>
         /// Gets or sets the show type.
         /// </summary>
         [JsonPropertyName("showType")]
-        public string ShowType { get; set; }
+        public string? ShowType { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether there is image artwork.
@@ -104,54 +103,54 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the primary image.
         /// </summary>
         [JsonPropertyName("primaryImage")]
-        public string PrimaryImage { get; set; }
+        public string? PrimaryImage { get; set; }
 
         /// <summary>
         /// Gets or sets the thumb image.
         /// </summary>
         [JsonPropertyName("thumbImage")]
-        public string ThumbImage { get; set; }
+        public string? ThumbImage { get; set; }
 
         /// <summary>
         /// Gets or sets the backdrop image.
         /// </summary>
         [JsonPropertyName("backdropImage")]
-        public string BackdropImage { get; set; }
+        public string? BackdropImage { get; set; }
 
         /// <summary>
         /// Gets or sets the banner image.
         /// </summary>
         [JsonPropertyName("bannerImage")]
-        public string BannerImage { get; set; }
+        public string? BannerImage { get; set; }
 
         /// <summary>
         /// Gets or sets the image id.
         /// </summary>
         [JsonPropertyName("imageID")]
-        public string ImageId { get; set; }
+        public string? ImageId { get; set; }
 
         /// <summary>
         /// Gets or sets the md5.
         /// </summary>
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
         /// <summary>
         /// Gets or sets the list of content advisory.
         /// </summary>
         [JsonPropertyName("contentAdvisory")]
-        public List<string> ContentAdvisory { get; set; }
+        public IReadOnlyList<string> ContentAdvisory { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the movie object.
         /// </summary>
         [JsonPropertyName("movie")]
-        public MovieDto Movie { get; set; }
+        public MovieDto? Movie { get; set; }
 
         /// <summary>
         /// Gets or sets the list of recommendations.
         /// </summary>
         [JsonPropertyName("recommendations")]
-        public List<RecommendationDto> Recommendations { get; set; }
+        public IReadOnlyList<RecommendationDto> Recommendations { get; set; } = Array.Empty<RecommendationDto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs
index ad5389100..ff039c1cf 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,13 +13,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// </summary>
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
         /// <summary>
         /// Gets or sets the air date time.
         /// </summary>
         [JsonPropertyName("airDateTime")]
-        public string AirDateTime { get; set; }
+        public string? AirDateTime { get; set; }
 
         /// <summary>
         /// Gets or sets the duration.
@@ -32,25 +31,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the md5.
         /// </summary>
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
         /// <summary>
         /// Gets or sets the list of audio properties.
         /// </summary>
         [JsonPropertyName("audioProperties")]
-        public List<string> AudioProperties { get; set; }
+        public IReadOnlyList<string> AudioProperties { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the list of video properties.
         /// </summary>
         [JsonPropertyName("videoProperties")]
-        public List<string> VideoProperties { get; set; }
+        public IReadOnlyList<string> VideoProperties { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the list of ratings.
         /// </summary>
         [JsonPropertyName("ratings")]
-        public List<RatingDto> Ratings { get; set; }
+        public IReadOnlyList<RatingDto> Ratings { get; set; } = Array.Empty<RatingDto>();
 
         /// <summary>
         /// Gets or sets a value indicating whether this program is new.
@@ -62,13 +61,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the multipart object.
         /// </summary>
         [JsonPropertyName("multipart")]
-        public MultipartDto Multipart { get; set; }
+        public MultipartDto? Multipart { get; set; }
 
         /// <summary>
         /// Gets or sets the live tape delay.
         /// </summary>
         [JsonPropertyName("liveTapeDelay")]
-        public string LiveTapeDelay { get; set; }
+        public string? LiveTapeDelay { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this is the premiere.
@@ -86,6 +85,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the premiere or finale.
         /// </summary>
         [JsonPropertyName("isPremiereOrFinale")]
-        public string IsPremiereOrFinale { get; set; }
+        public string? IsPremiereOrFinale { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs
index 5cd0a7459..c5ddcf7c5 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the ratings body.
         /// </summary>
         [JsonPropertyName("ratingsBody")]
-        public string RatingsBody { get; set; }
+        public string? RatingsBody { get; set; }
 
         /// <summary>
         /// Gets or sets the rating.
         /// </summary>
         [JsonPropertyName("rating")]
-        public string Rating { get; set; }
+        public string? Rating { get; set; }
 
         /// <summary>
         /// Gets or sets the min rating.
         /// </summary>
         [JsonPropertyName("minRating")]
-        public string MinRating { get; set; }
+        public string? MinRating { get; set; }
 
         /// <summary>
         /// Gets or sets the max rating.
         /// </summary>
         [JsonPropertyName("maxRating")]
-        public string MaxRating { get; set; }
+        public string? MaxRating { get; set; }
 
         /// <summary>
         /// Gets or sets the increment.
         /// </summary>
         [JsonPropertyName("increment")]
-        public string Increment { get; set; }
+        public string? Increment { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs
index 948b83144..e04b619a4 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the body.
         /// </summary>
         [JsonPropertyName("body")]
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
         /// <summary>
         /// Gets or sets the code.
         /// </summary>
         [JsonPropertyName("code")]
-        public string Code { get; set; }
+        public string? Code { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs
index 1308f45ce..c8f79fd1c 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// </summary>
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
         /// <summary>
         /// Gets or sets the title.
         /// </summary>
         [JsonPropertyName("title120")]
-        public string Title120 { get; set; }
+        public string? Title120 { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs
index fb7a31ac8..0cd05709b 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the station id.
         /// </summary>
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
         /// <summary>
         /// Gets or sets the list of dates.
         /// </summary>
         [JsonPropertyName("date")]
-        public List<string> Date { get; set; }
+        public IReadOnlyList<string> Date { get; set; } = Array.Empty<string>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs
index 34302370d..84e224b71 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// </summary>
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
         /// <summary>
         /// Gets or sets the list of data.
         /// </summary>
         [JsonPropertyName("data")]
-        public List<ImageDataDto> Data { get; set; }
+        public IReadOnlyList<ImageDataDto> Data { get; set; } = Array.Empty<ImageDataDto>();
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
index 12f3576c6..1b76b22e3 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -14,49 +13,49 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
                 /// Gets or sets the station id.
                 /// </summary>
                 [JsonPropertyName("stationID")]
-                public string StationId { get; set; }
+                public string? StationId { get; set; }
 
                 /// <summary>
                 /// Gets or sets the name.
                 /// </summary>
                 [JsonPropertyName("name")]
-                public string Name { get; set; }
+                public string? Name { get; set; }
 
                 /// <summary>
                 /// Gets or sets the callsign.
                 /// </summary>
                 [JsonPropertyName("callsign")]
-                public string Callsign { get; set; }
+                public string? Callsign { get; set; }
 
                 /// <summary>
                 /// Gets or sets the broadcast language.
                 /// </summary>
                 [JsonPropertyName("broadcastLanguage")]
-                public List<string> BroadcastLanguage { get; set; }
+                public IReadOnlyList<string> BroadcastLanguage { get; set; } = Array.Empty<string>();
 
                 /// <summary>
                 /// Gets or sets the description language.
                 /// </summary>
                 [JsonPropertyName("descriptionLanguage")]
-                public List<string> DescriptionLanguage { get; set; }
+                public IReadOnlyList<string> DescriptionLanguage { get; set; } = Array.Empty<string>();
 
                 /// <summary>
                 /// Gets or sets the broadcaster.
                 /// </summary>
                 [JsonPropertyName("broadcaster")]
-                public BroadcasterDto Broadcaster { get; set; }
+                public BroadcasterDto? Broadcaster { get; set; }
 
                 /// <summary>
                 /// Gets or sets the affiliate.
                 /// </summary>
                 [JsonPropertyName("affiliate")]
-                public string Affiliate { get; set; }
+                public string? Affiliate { get; set; }
 
                 /// <summary>
                 /// Gets or sets the logo.
                 /// </summary>
                 [JsonPropertyName("logo")]
-                public LogoDto Logo { get; set; }
+                public LogoDto? Logo { get; set; }
 
                 /// <summary>
                 /// Gets or set a value indicating whether it is commercial free.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs
index 06c95524b..61cd4a9b0 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,6 +11,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the title.
         /// </summary>
         [JsonPropertyName("title120")]
-        public string Title120 { get; set; }
+        public string? Title120 { get; set; }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
index c3ec1c7d6..fb5ed95ac 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Text.Json.Serialization;
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -19,18 +18,24 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the response message.
         /// </summary>
         [JsonPropertyName("message")]
-        public string Message { get; set; }
+        public string? Message { get; set; }
 
         /// <summary>
         /// Gets or sets the server id.
         /// </summary>
         [JsonPropertyName("serverID")]
-        public string ServerId { get; set; }
+        public string? ServerId { get; set; }
 
         /// <summary>
         /// Gets or sets the token.
         /// </summary>
         [JsonPropertyName("token")]
-        public string Token { get; set; }
+        public string? Token { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current datetime.
+        /// </summary>
+        [JsonPropertyName("datetime")]
+        public DateTime? DateTime { get; set; }
     }
 }