Merge pull request #2677 from MediaBrowser/beta

Beta

1 files changed, 7 insertions, 22 deletions

diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index b1f196f15..3b638208b 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
@@ -308,6 +307,8 @@ namespace MediaBrowser.Api.UserLibrary
                 }
             }
 
+            var dtoOptions = GetDtoOptions(_authContext, request);
+
             var list = _userViewManager.GetLatestItems(new LatestItemsQuery
             {
                 GroupItems = request.GroupItems,
@@ -315,10 +316,8 @@ namespace MediaBrowser.Api.UserLibrary
                 IsPlayed = request.IsPlayed,
                 Limit = request.Limit,
                 ParentId = request.ParentId,
-                UserId = request.UserId
-            });
-
-            var dtoOptions = GetDtoOptions(_authContext, request);
+                UserId = request.UserId,
+            }, dtoOptions);
 
             var dtos = list.Select(i =>
             {
@@ -360,22 +359,8 @@ namespace MediaBrowser.Api.UserLibrary
                 var currentUser = user;
 
                 var dtos = series
-                    .GetEpisodes(user)
+                    .GetEpisodes(user, dtoOptions)
                     .Where(i => i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
-                    .OrderBy(i =>
-                    {
-                        if (i.PremiereDate.HasValue)
-                        {
-                            return i.PremiereDate.Value;
-                        }
-
-                        if (i.ProductionYear.HasValue)
-                        {
-                            return new DateTime(i.ProductionYear.Value, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-                        }
-                        return DateTime.MinValue;
-                    })
-                    .ThenBy(i => i.SortName)
                     .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, currentUser));
 
                 return dtos.ToList();
@@ -556,7 +541,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             await _userDataRepository.SaveUserData(user.Id, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None).ConfigureAwait(false);
 
-            return await _userDataRepository.GetUserDataDto(item, user).ConfigureAwait(false);
+            return _userDataRepository.GetUserDataDto(item, user);
         }
 
         /// <summary>
@@ -601,7 +586,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             await _userDataRepository.SaveUserData(user.Id, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None).ConfigureAwait(false);
 
-            return await _userDataRepository.GetUserDataDto(item, user).ConfigureAwait(false);
+            return _userDataRepository.GetUserDataDto(item, user);
         }
     }
 }