support adding additional users to sessions

1 files changed, 11 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 4f97a6506..c6c23ac2e 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -244,7 +244,8 @@ namespace MediaBrowser.Server.Implementations.Dto
                 ApplicationVersion = session.ApplicationVersion,
                 CanSeek = session.CanSeek,
                 QueueableMediaTypes = session.QueueableMediaTypes,
-                RemoteEndPoint = session.RemoteEndPoint
+                RemoteEndPoint = session.RemoteEndPoint,
+                AdditionalUsersPresent = session.AdditionalUsersPresent
             };
 
             if (session.NowPlayingItem != null)
@@ -252,11 +253,11 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.NowPlayingItem = GetBaseItemInfo(session.NowPlayingItem);
             }
 
-            if (session.User != null)
+            if (session.UserId.HasValue)
             {
-                dto.UserId = session.User.Id.ToString("N");
-                dto.UserName = session.User.Name;
+                dto.UserId = session.UserId.Value.ToString("N");
             }
+            dto.UserName = session.UserName;
 
             return dto;
         }
@@ -769,6 +770,12 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.DisplayOrder = hasDisplayOrder.DisplayOrder;
             }
+
+            var collectionFolder = item as CollectionFolder;
+            if (collectionFolder != null)
+            {
+                dto.CollectionType = collectionFolder.CollectionType;
+            }
             
             if (fields.Contains(ItemFields.RemoteTrailers))
             {