1 files changed, 37 insertions, 51 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
index 09814b191..a792f8b03 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
@@ -1,11 +1,10 @@
-using System;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Api.HttpHandlers
 {
@@ -13,68 +12,55 @@ namespace MediaBrowser.Api.HttpHandlers
     {
         protected override Task<DTOBaseItem[]> GetObjectToSerialize()
         {
-            User user = Kernel.Instance.Users.First(u => u.Id == UserId);
+            User user = ApiService.GetUserById(QueryString["userid"], true);
 
-            return Task.WhenAll<DTOBaseItem>(ItemsToSerialize.Select(i =>
+            return Task.WhenAll<DTOBaseItem>(GetItemsToSerialize(user).Select(i =>
             {
                 return ApiService.GetDTOBaseItem(i, user, includeChildren: false, includePeople: false);
             }));
         }
 
-        protected IEnumerable<BaseItem> ItemsToSerialize
+        private IEnumerable<BaseItem> GetItemsToSerialize(User user)
         {
-            get
-            {
-                Folder parent = ApiService.GetItemById(ItemId) as Folder;
-
-                User user = Kernel.Instance.Users.First(u => u.Id == UserId);
+            Folder parent = ApiService.GetItemById(ItemId) as Folder;
 
-                if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetInProgressItems(user);
-                }
-                else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetRecentlyAddedItems(user);
-                }
-                else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetRecentlyAddedUnplayedItems(user);
-                }
-                else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetItemsWithGenre(QueryString["name"], user);
-                }
-                else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user);
-                }
-                else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetItemsWithStudio(QueryString["name"], user);
-                }
-                else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
-                {
-                    return parent.GetItemsWithPerson(QueryString["name"], null, user);
-                }
-
-                throw new InvalidOperationException();
+            if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetInProgressItems(user);
             }
-        }
-
-        protected string ItemId
-        {
-            get
+            else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
             {
-                return QueryString["id"];
+                return parent.GetRecentlyAddedItems(user);
+            }
+            else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetRecentlyAddedUnplayedItems(user);
+            }
+            else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetItemsWithGenre(QueryString["name"], user);
+            }
+            else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user);
             }
+            else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetItemsWithStudio(QueryString["name"], user);
+            }
+            else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
+            {
+                return parent.GetItemsWithPerson(QueryString["name"], null, user);
+            }
+
+            throw new InvalidOperationException();
         }
 
-        protected Guid UserId
+        protected string ItemId
         {
             get
             {
-                return Guid.Parse(QueryString["userid"]);
+                return QueryString["id"];
             }
         }