2 files changed, 6 insertions, 23 deletions
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
index d2d9f1f9a..251ff5d68 100644
--- a/MediaBrowser.Model/Querying/LatestItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -2,6 +2,7 @@
 #pragma warning disable CS1591
 
 using System;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Model.Entities;
 
@@ -18,7 +19,7 @@ namespace MediaBrowser.Model.Querying
         /// Gets or sets the user to localize search results for.
         /// </summary>
         /// <value>The user id.</value>
-        public Guid UserId { get; set; }
+        public User User { get; set; }
 
         /// <summary>
         /// Gets or sets the parent id.
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index 35353e6fa..8dece28a0 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -1,7 +1,7 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
@@ -19,10 +19,10 @@ namespace MediaBrowser.Model.Querying
         }
 
         /// <summary>
-        /// Gets or sets the user id.
+        /// Gets or sets the user.
         /// </summary>
-        /// <value>The user id.</value>
-        public Guid UserId { get; set; }
+        /// <value>The user.</value>
+        public required User User { get; set; }
 
         /// <summary>
         /// Gets or sets the parent identifier.
@@ -49,24 +49,6 @@ namespace MediaBrowser.Model.Querying
         public int? Limit { get; set; }
 
         /// <summary>
-        /// gets or sets the fields to return within the items, in addition to basic information.
-        /// </summary>
-        /// <value>The fields.</value>
-        public ItemFields[] Fields { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable images].
-        /// </summary>
-        /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
-        public bool? EnableImages { get; set; }
-
-        /// <summary>
-        /// Gets or sets the image type limit.
-        /// </summary>
-        /// <value>The image type limit.</value>
-        public int? ImageTypeLimit { get; set; }
-
-        /// <summary>
         /// Gets or sets the enable image types.
         /// </summary>
         /// <value>The enable image types.</value>