Merge branch 'master' into segment-deletion

1 files changed, 4 insertions, 7 deletions

diff --git a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
index 87babc05c..bfae81e4c 100644
--- a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
+++ b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
@@ -15,13 +15,13 @@ namespace Jellyfin.Server.Implementations.Users
     /// </summary>
     public class DisplayPreferencesManager : IDisplayPreferencesManager
     {
-        private readonly JellyfinDb _dbContext;
+        private readonly JellyfinDbContext _dbContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DisplayPreferencesManager"/> class.
         /// </summary>
         /// <param name="dbContextFactory">The database context factory.</param>
-        public DisplayPreferencesManager(IDbContextFactory<JellyfinDb> dbContextFactory)
+        public DisplayPreferencesManager(IDbContextFactory<JellyfinDbContext> dbContextFactory)
         {
             _dbContext = dbContextFactory.CreateDbContext();
         }
@@ -34,7 +34,7 @@ namespace Jellyfin.Server.Implementations.Users
                 .FirstOrDefault(pref =>
                     pref.UserId.Equals(userId) && string.Equals(pref.Client, client) && pref.ItemId.Equals(itemId));
 
-            if (prefs == null)
+            if (prefs is null)
             {
                 prefs = new DisplayPreferences(userId, itemId, client);
                 _dbContext.DisplayPreferences.Add(prefs);
@@ -49,7 +49,7 @@ namespace Jellyfin.Server.Implementations.Users
             var prefs = _dbContext.ItemDisplayPreferences
                 .FirstOrDefault(pref => pref.UserId.Equals(userId) && pref.ItemId.Equals(itemId) && string.Equals(pref.Client, client));
 
-            if (prefs == null)
+            if (prefs is null)
             {
                 prefs = new ItemDisplayPreferences(userId, Guid.Empty, client);
                 _dbContext.ItemDisplayPreferences.Add(prefs);
@@ -62,7 +62,6 @@ namespace Jellyfin.Server.Implementations.Users
         public IList<ItemDisplayPreferences> ListItemDisplayPreferences(Guid userId, string client)
         {
             return _dbContext.ItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId) && !prefs.ItemId.Equals(default) && string.Equals(prefs.Client, client))
                 .ToList();
         }
@@ -71,7 +70,6 @@ namespace Jellyfin.Server.Implementations.Users
         public Dictionary<string, string?> ListCustomItemDisplayPreferences(Guid userId, Guid itemId, string client)
         {
             return _dbContext.CustomItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId)
                                 && prefs.ItemId.Equals(itemId)
                                 && string.Equals(prefs.Client, client))
@@ -82,7 +80,6 @@ namespace Jellyfin.Server.Implementations.Users
         public void SetCustomItemDisplayPreferences(Guid userId, Guid itemId, string client, Dictionary<string, string?> customPreferences)
         {
             var existingPrefs = _dbContext.CustomItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId)
                                 && prefs.ItemId.Equals(itemId)
                                 && string.Equals(prefs.Client, client));