Merge branch 'master' into authenticationdb-efcore

# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs

3 files changed, 8 insertions, 4 deletions

diff --git a/Jellyfin.Data/Entities/CustomItemDisplayPreferences.cs b/Jellyfin.Data/Entities/CustomItemDisplayPreferences.cs
index f12737f657..b07b7c7315 100644
--- a/Jellyfin.Data/Entities/CustomItemDisplayPreferences.cs
+++ b/Jellyfin.Data/Entities/CustomItemDisplayPreferences.cs
@@ -17,7 +17,7 @@ namespace Jellyfin.Data.Entities
         /// <param name="client">The client.</param>
         /// <param name="key">The preference key.</param>
         /// <param name="value">The preference value.</param>
-        public CustomItemDisplayPreferences(Guid userId, Guid itemId, string client, string key, string value)
+        public CustomItemDisplayPreferences(Guid userId, Guid itemId, string client, string key, string? value)
         {
             UserId = userId;
             ItemId = itemId;
@@ -75,6 +75,6 @@ namespace Jellyfin.Data.Entities
         /// <remarks>
         /// Required.
         /// </remarks>
-        public string Value { get; set; }
+        public string? Value { get; set; }
     }
 }
diff --git a/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs b/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
index b75b0a25be..42115802c5 100644
--- a/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using Jellyfin.Data.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
diff --git a/Jellyfin.Data/Enums/HomeSectionType.cs b/Jellyfin.Data/Enums/HomeSectionType.cs
index e597c9431a..9bcd097dc6 100644
--- a/Jellyfin.Data/Enums/HomeSectionType.cs
+++ b/Jellyfin.Data/Enums/HomeSectionType.cs
@@ -48,6 +48,11 @@
         /// <summary>
         /// Live TV.
         /// </summary>
-        LiveTv = 8
+        LiveTv = 8,
+
+        /// <summary>
+        /// Continue Reading.
+        /// </summary>
+        ResumeBook = 9
     }
 }