Sfoglia il codice sorgente

Use existing userData (#14703)

Cody Robibero 1 settimana fa
parent
commit
da3f3b09d9
1 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. 5 6
      MediaBrowser.Controller/Entities/UserViewBuilder.cs

+ 5 - 6
MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -502,7 +502,6 @@ namespace MediaBrowser.Controller.Entities
             if (query.IsLiked.HasValue)
             if (query.IsLiked.HasValue)
             {
             {
                 userData = userDataManager.GetUserData(user, item);
                 userData = userDataManager.GetUserData(user, item);
-
                 if (!userData.Likes.HasValue || userData.Likes != query.IsLiked.Value)
                 if (!userData.Likes.HasValue || userData.Likes != query.IsLiked.Value)
                 {
                 {
                     return false;
                     return false;
@@ -511,7 +510,7 @@ namespace MediaBrowser.Controller.Entities
 
 
             if (query.IsFavoriteOrLiked.HasValue)
             if (query.IsFavoriteOrLiked.HasValue)
             {
             {
-                userData = userData ?? userDataManager.GetUserData(user, item);
+                userData ??= userDataManager.GetUserData(user, item);
                 var isFavoriteOrLiked = userData.IsFavorite || (userData.Likes ?? false);
                 var isFavoriteOrLiked = userData.IsFavorite || (userData.Likes ?? false);
 
 
                 if (isFavoriteOrLiked != query.IsFavoriteOrLiked.Value)
                 if (isFavoriteOrLiked != query.IsFavoriteOrLiked.Value)
@@ -522,8 +521,7 @@ namespace MediaBrowser.Controller.Entities
 
 
             if (query.IsFavorite.HasValue)
             if (query.IsFavorite.HasValue)
             {
             {
-                userData = userData ?? userDataManager.GetUserData(user, item);
-
+                userData ??= userDataManager.GetUserData(user, item);
                 if (userData.IsFavorite != query.IsFavorite.Value)
                 if (userData.IsFavorite != query.IsFavorite.Value)
                 {
                 {
                     return false;
                     return false;
@@ -532,7 +530,7 @@ namespace MediaBrowser.Controller.Entities
 
 
             if (query.IsResumable.HasValue)
             if (query.IsResumable.HasValue)
             {
             {
-                userData = userData ?? userDataManager.GetUserData(user, item);
+                userData ??= userDataManager.GetUserData(user, item);
                 var isResumable = userData.PlaybackPositionTicks > 0;
                 var isResumable = userData.PlaybackPositionTicks > 0;
 
 
                 if (isResumable != query.IsResumable.Value)
                 if (isResumable != query.IsResumable.Value)
@@ -543,7 +541,8 @@ namespace MediaBrowser.Controller.Entities
 
 
             if (query.IsPlayed.HasValue)
             if (query.IsPlayed.HasValue)
             {
             {
-                if (item.IsPlayed(user) != query.IsPlayed.Value)
+                userData ??= userDataManager.GetUserData(user, item);
+                if (userData.Played != query.IsPlayed.Value)
                 {
                 {
                     return false;
                     return false;
                 }
                 }