From 8819a9d478e6fc11dbfdcff80d9a2dc175953373 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Thu, 24 Sep 2020 23:04:21 +0200
Subject: Add playlist-sync and group-wait to SyncPlay

---
 Jellyfin.Api/Controllers/SyncPlayController.cs | 300 ++++++++++++++++++++++---
 1 file changed, 274 insertions(+), 26 deletions(-)

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index e16a10ba4..847c3ab11 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -43,14 +43,20 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Create a new SyncPlay group.
         /// </summary>
+        /// <param name="groupName">The name of the new group.</param>
         /// <response code="204">New group created.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("New")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayCreateGroup()
+        public ActionResult SyncPlayCreateGroup(
+            [FromQuery, Required] string groupName)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            _syncPlayManager.NewGroup(currentSession, CancellationToken.None);
+            var newGroupRequest = new NewGroupRequest()
+            {
+                GroupName = groupName
+            };
+            _syncPlayManager.NewGroup(currentSession, newGroupRequest, CancellationToken.None);
             return NoContent();
         }
 
@@ -62,15 +68,14 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Join")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayJoinGroup([FromQuery, Required] Guid groupId)
+        public ActionResult SyncPlayJoinGroup(
+            [FromQuery, Required] Guid groupId)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-
             var joinRequest = new JoinGroupRequest()
             {
                 GroupId = groupId
             };
-
             _syncPlayManager.JoinGroup(currentSession, groupId, joinRequest, CancellationToken.None);
             return NoContent();
         }
@@ -92,35 +97,143 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Gets all SyncPlay groups.
         /// </summary>
-        /// <param name="filterItemId">Optional. Filter by item id.</param>
         /// <response code="200">Groups returned.</response>
         /// <returns>An <see cref="IEnumerable{GroupInfoView}"/> containing the available SyncPlay groups.</returns>
         [HttpGet("List")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<IEnumerable<GroupInfoView>> SyncPlayGetGroups([FromQuery] Guid? filterItemId)
+        public ActionResult<IEnumerable<GroupInfoDto>> SyncPlayGetGroups()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            return Ok(_syncPlayManager.ListGroups(currentSession, filterItemId.HasValue ? filterItemId.Value : Guid.Empty));
+            return Ok(_syncPlayManager.ListGroups(currentSession));
         }
 
         /// <summary>
         /// Request play in SyncPlay group.
         /// </summary>
+        /// <param name="playingQueue">The playing queue. Item ids in the playing queue, comma delimited.</param>
+        /// <param name="playingItemPosition">The playing item position from the queue.</param>
+        /// <param name="startPositionTicks">The start position ticks.</param>
         /// <response code="204">Play request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Play")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayPlay()
+        public ActionResult SyncPlayPlay(
+            [FromQuery, Required] string playingQueue,
+            [FromQuery, Required] int playingItemPosition,
+            [FromQuery, Required] long startPositionTicks)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new PlayGroupRequest()
+            {
+                PlayingQueue = RequestHelpers.GetGuids(playingQueue),
+                PlayingItemPosition = playingItemPosition,
+                StartPositionTicks = startPositionTicks
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to change playlist item in SyncPlay group.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist id of the item.</param>
+        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("SetPlaylistItem")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlaySetPlaylistItem(
+            [FromQuery, Required] string playlistItemId)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new SetPlaylistItemGroupRequest()
+            {
+                PlaylistItemId = playlistItemId
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to remove items from the playlist in SyncPlay group.
+        /// </summary>
+        /// <param name="playlistItemIds">The playlist ids of the items to remove.</param>
+        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("RemoveFromPlaylist")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayRemoveFromPlaylist(
+            [FromQuery, Required] string[] playlistItemIds)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new RemoveFromPlaylistGroupRequest()
+            {
+                PlaylistItemIds = playlistItemIds
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to move an item in the playlist in SyncPlay group.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist id of the item to move.</param>
+        /// <param name="newIndex">The new position.</param>
+        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("MovePlaylistItem")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayMovePlaylistItem(
+            [FromQuery, Required] string playlistItemId,
+            [FromQuery, Required] int newIndex)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new MovePlaylistItemGroupRequest()
+            {
+                PlaylistItemId = playlistItemId,
+                NewIndex = newIndex
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to queue items to the playlist of a SyncPlay group.
+        /// </summary>
+        /// <param name="itemIds">The items to add. Item ids, comma delimited.</param>
+        /// <param name="mode">The mode in which to queue items.</param>
+        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("Queue")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayQueue(
+            [FromQuery, Required] string itemIds,
+            [FromQuery, Required] string mode)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlaybackRequest()
+            var syncPlayRequest = new QueueGroupRequest()
             {
-                Type = PlaybackRequestType.Play
+                ItemIds = RequestHelpers.GetGuids(itemIds),
+                Mode = mode
             };
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
+        /// <summary>
+        /// Request unpause in SyncPlay group.
+        /// </summary>
+        /// <response code="204">Unpause request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("Unpause")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayUnpause()
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new UnpauseGroupRequest();
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
         /// <summary>
         /// Request pause in SyncPlay group.
         /// </summary>
@@ -131,10 +244,22 @@ namespace Jellyfin.Api.Controllers
         public ActionResult SyncPlayPause()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlaybackRequest()
-            {
-                Type = PlaybackRequestType.Pause
-            };
+            var syncPlayRequest = new PauseGroupRequest();
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request stop in SyncPlay group.
+        /// </summary>
+        /// <response code="204">Stop request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("Stop")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayStop()
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new StopGroupRequest();
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -147,12 +272,12 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Seek")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlaySeek([FromQuery] long positionTicks)
+        public ActionResult SyncPlaySeek(
+            [FromQuery, Required] long positionTicks)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlaybackRequest()
+            var syncPlayRequest = new SeekGroupRequest()
             {
-                Type = PlaybackRequestType.Seek,
                 PositionTicks = positionTicks
             };
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
@@ -164,19 +289,142 @@ namespace Jellyfin.Api.Controllers
         /// </summary>
         /// <param name="when">When the request has been made by the client.</param>
         /// <param name="positionTicks">The playback position in ticks.</param>
+        /// <param name="isPlaying">Whether the client's playback is playing or not.</param>
+        /// <param name="playlistItemId">The playlist item id.</param>
         /// <param name="bufferingDone">Whether the buffering is done.</param>
         /// <response code="204">Buffering request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Buffering")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayBuffering([FromQuery] DateTime when, [FromQuery] long positionTicks, [FromQuery] bool bufferingDone)
+        public ActionResult SyncPlayBuffering(
+            [FromQuery, Required] DateTime when,
+            [FromQuery, Required] long positionTicks,
+            [FromQuery, Required] bool isPlaying,
+            [FromQuery, Required] string playlistItemId,
+            [FromQuery, Required] bool bufferingDone)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlaybackRequest()
+            IPlaybackGroupRequest syncPlayRequest;
+            if (!bufferingDone)
             {
-                Type = bufferingDone ? PlaybackRequestType.Ready : PlaybackRequestType.Buffer,
-                When = when,
-                PositionTicks = positionTicks
+                syncPlayRequest = new BufferGroupRequest()
+                {
+                    When = when,
+                    PositionTicks = positionTicks,
+                    IsPlaying = isPlaying,
+                    PlaylistItemId = playlistItemId
+                };
+            }
+            else
+            {
+                syncPlayRequest = new ReadyGroupRequest()
+                {
+                    When = when,
+                    PositionTicks = positionTicks,
+                    IsPlaying = isPlaying,
+                    PlaylistItemId = playlistItemId
+                };
+            }
+
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request SyncPlay group to ignore member during group-wait.
+        /// </summary>
+        /// <param name="ignoreWait">Whether to ignore the member.</param>
+        /// <response code="204">Member state updated.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("SetIgnoreWait")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlaySetIgnoreWait(
+            [FromQuery, Required] bool ignoreWait)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new IgnoreWaitGroupRequest()
+            {
+                IgnoreWait = ignoreWait
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request next track in SyncPlay group.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item id.</param>
+        /// <response code="204">Next track request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("NextTrack")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayNextTrack(
+            [FromQuery, Required] string playlistItemId)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new NextTrackGroupRequest()
+            {
+                PlaylistItemId = playlistItemId
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request previous track in SyncPlay group.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item id.</param>
+        /// <response code="204">Previous track request sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("PreviousTrack")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayPreviousTrack(
+            [FromQuery, Required] string playlistItemId)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new PreviousTrackGroupRequest()
+            {
+                PlaylistItemId = playlistItemId
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to set repeat mode in SyncPlay group.
+        /// </summary>
+        /// <param name="mode">The repeat mode.</param>
+        /// <response code="204">Play queue update sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("SetRepeatMode")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlaySetRepeatMode(
+            [FromQuery, Required] string mode)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new SetRepeatModeGroupRequest()
+            {
+                Mode = mode
+            };
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Request to set shuffle mode in SyncPlay group.
+        /// </summary>
+        /// <param name="mode">The shuffle mode.</param>
+        /// <response code="204">Play queue update sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("SetShuffleMode")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlaySetShuffleMode(
+            [FromQuery, Required] string mode)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new SetShuffleModeGroupRequest()
+            {
+                Mode = mode
             };
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
@@ -190,12 +438,12 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Ping")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayPing([FromQuery] double ping)
+        public ActionResult SyncPlayPing(
+            [FromQuery, Required] double ping)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlaybackRequest()
+            var syncPlayRequest = new PingGroupRequest()
             {
-                Type = PlaybackRequestType.Ping,
                 Ping = Convert.ToInt64(ping)
             };
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
-- 
cgit v1.2.3


From 1dbc91978ece81628c339d1dc3b53f6d250cb005 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Fri, 13 Nov 2020 15:13:32 +0100
Subject: Address requested changes and fix some warnings

---
 .../SyncPlay/GroupController.cs                    | 251 ++++----
 .../SyncPlay/GroupStates/AbstractGroupState.cs     | 218 -------
 .../SyncPlay/GroupStates/IdleGroupState.cs         | 122 ----
 .../SyncPlay/GroupStates/PausedGroupState.cs       | 161 -----
 .../SyncPlay/GroupStates/PlayingGroupState.cs      | 166 -----
 .../SyncPlay/GroupStates/WaitingGroupState.cs      | 683 ---------------------
 .../SyncPlay/SyncPlayManager.cs                    |  27 +-
 Jellyfin.Api/Controllers/SyncPlayController.cs     |  12 +-
 .../SyncPlay/GroupStates/AbstractGroupState.cs     | 216 +++++++
 .../SyncPlay/GroupStates/IdleGroupState.cs         | 126 ++++
 .../SyncPlay/GroupStates/PausedGroupState.cs       | 165 +++++
 .../SyncPlay/GroupStates/PlayingGroupState.cs      | 168 +++++
 .../SyncPlay/GroupStates/WaitingGroupState.cs      | 655 ++++++++++++++++++++
 .../SyncPlay/IGroupController.cs                   |  84 +++
 .../SyncPlay/IGroupPlaybackRequest.cs              |  27 +
 MediaBrowser.Controller/SyncPlay/IGroupState.cs    | 216 +++++++
 .../SyncPlay/IGroupStateContext.cs                 | 228 +++++++
 .../SyncPlay/IPlaybackGroupRequest.cs              |  23 -
 .../SyncPlay/ISyncPlayController.cs                |  85 ---
 .../SyncPlay/ISyncPlayManager.cs                   |   6 +-
 MediaBrowser.Controller/SyncPlay/ISyncPlayState.cs | 216 -------
 .../SyncPlay/ISyncPlayStateContext.cs              | 225 -------
 .../SyncPlay/PlaybackRequest/BufferGroupRequest.cs |  49 --
 .../PlaybackRequest/IgnoreWaitGroupRequest.cs      |  30 -
 .../MovePlaylistItemGroupRequest.cs                |  36 --
 .../PlaybackRequest/NextTrackGroupRequest.cs       |  30 -
 .../SyncPlay/PlaybackRequest/PauseGroupRequest.cs  |  24 -
 .../SyncPlay/PlaybackRequest/PingGroupRequest.cs   |  30 -
 .../SyncPlay/PlaybackRequest/PlayGroupRequest.cs   |  43 --
 .../PlaybackRequest/PreviousTrackGroupRequest.cs   |  30 -
 .../SyncPlay/PlaybackRequest/QueueGroupRequest.cs  |  37 --
 .../SyncPlay/PlaybackRequest/ReadyGroupRequest.cs  |  49 --
 .../RemoveFromPlaylistGroupRequest.cs              |  30 -
 .../SyncPlay/PlaybackRequest/SeekGroupRequest.cs   |  30 -
 .../PlaybackRequest/SetCurrentItemGroupRequest.cs  |  30 -
 .../PlaybackRequest/SetRepeatModeGroupRequest.cs   |  30 -
 .../PlaybackRequest/SetShuffleModeGroupRequest.cs  |  30 -
 .../SyncPlay/PlaybackRequest/StopGroupRequest.cs   |  24 -
 .../PlaybackRequest/UnpauseGroupRequest.cs         |  24 -
 .../PlaybackRequests/BufferGroupRequest.cs         |  46 ++
 .../PlaybackRequests/IgnoreWaitGroupRequest.cs     |  27 +
 .../MovePlaylistItemGroupRequest.cs                |  33 +
 .../PlaybackRequests/NextTrackGroupRequest.cs      |  27 +
 .../SyncPlay/PlaybackRequests/PauseGroupRequest.cs |  21 +
 .../SyncPlay/PlaybackRequests/PingGroupRequest.cs  |  27 +
 .../SyncPlay/PlaybackRequests/PlayGroupRequest.cs  |  41 ++
 .../PlaybackRequests/PreviousTrackGroupRequest.cs  |  27 +
 .../SyncPlay/PlaybackRequests/QueueGroupRequest.cs |  35 ++
 .../SyncPlay/PlaybackRequests/ReadyGroupRequest.cs |  46 ++
 .../RemoveFromPlaylistGroupRequest.cs              |  28 +
 .../SyncPlay/PlaybackRequests/SeekGroupRequest.cs  |  27 +
 .../SetPlaylistItemGroupRequest.cs                 |  27 +
 .../PlaybackRequests/SetRepeatModeGroupRequest.cs  |  27 +
 .../PlaybackRequests/SetShuffleModeGroupRequest.cs |  27 +
 .../SyncPlay/PlaybackRequests/StopGroupRequest.cs  |  21 +
 .../PlaybackRequests/UnpauseGroupRequest.cs        |  21 +
 .../SyncPlay/Queue/PlayQueueManager.cs             | 315 ++++++----
 MediaBrowser.Model/SyncPlay/GroupInfoDto.cs        |   2 +-
 MediaBrowser.Model/SyncPlay/GroupState.cs          |  25 -
 MediaBrowser.Model/SyncPlay/GroupStateType.cs      |  28 +
 MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs    |   4 +-
 MediaBrowser.Model/SyncPlay/GroupUpdate.cs         |   1 +
 MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs     |   4 +-
 MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs |   1 +
 64 files changed, 2752 insertions(+), 2772 deletions(-)
 delete mode 100644 Emby.Server.Implementations/SyncPlay/GroupStates/AbstractGroupState.cs
 delete mode 100644 Emby.Server.Implementations/SyncPlay/GroupStates/IdleGroupState.cs
 delete mode 100644 Emby.Server.Implementations/SyncPlay/GroupStates/PausedGroupState.cs
 delete mode 100644 Emby.Server.Implementations/SyncPlay/GroupStates/PlayingGroupState.cs
 delete mode 100644 Emby.Server.Implementations/SyncPlay/GroupStates/WaitingGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/IGroupController.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/IGroupState.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/IPlaybackGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/ISyncPlayController.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/ISyncPlayState.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/ISyncPlayStateContext.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/BufferGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/IgnoreWaitGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/MovePlaylistItemGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/NextTrackGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/PauseGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/PingGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/PlayGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/PreviousTrackGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/QueueGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/ReadyGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/RemoveFromPlaylistGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/SeekGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetCurrentItemGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetRepeatModeGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetShuffleModeGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/StopGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequest/UnpauseGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/GroupState.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/GroupStateType.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs
index ffd65d7f8..5a3c707db 100644
--- a/Emby.Server.Implementations/SyncPlay/GroupController.cs
+++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs
@@ -16,28 +16,13 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.SyncPlay
 {
     /// <summary>
-    /// Class SyncPlayGroupController.
+    /// Class GroupController.
     /// </summary>
     /// <remarks>
     /// Class is not thread-safe, external locking is required when accessing methods.
     /// </remarks>
-    public class SyncPlayGroupController : ISyncPlayGroupController, ISyncPlayStateContext
+    public class GroupController : IGroupController, IGroupStateContext
     {
-        /// <summary>
-        /// Gets the default ping value used for sessions.
-        /// </summary>
-        public long DefaultPing { get; } = 500;
-
-        /// <summary>
-        /// Gets the maximum time offset error accepted for dates reported by clients, in milliseconds.
-        /// </summary>
-        public long TimeSyncOffset { get; } = 2000;
-
-        /// <summary>
-        /// Gets the maximum offset error accepted for position reported by clients, in milliseconds.
-        /// </summary>
-        public long MaxPlaybackOffset { get; } = 500;
-
         /// <summary>
         /// The logger.
         /// </summary>
@@ -67,7 +52,46 @@ namespace Emby.Server.Implementations.SyncPlay
         /// Internal group state.
         /// </summary>
         /// <value>The group's state.</value>
-        private ISyncPlayState State;
+        private IGroupState _state;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GroupController" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="sessionManager">The session manager.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="syncPlayManager">The SyncPlay manager.</param>
+        public GroupController(
+            ILogger logger,
+            IUserManager userManager,
+            ISessionManager sessionManager,
+            ILibraryManager libraryManager,
+            ISyncPlayManager syncPlayManager)
+        {
+            _logger = logger;
+            _userManager = userManager;
+            _sessionManager = sessionManager;
+            _libraryManager = libraryManager;
+            _syncPlayManager = syncPlayManager;
+
+            _state = new IdleGroupState(_logger);
+        }
+
+        /// <summary>
+        /// Gets the default ping value used for sessions.
+        /// </summary>
+        public long DefaultPing { get; } = 500;
+
+        /// <summary>
+        /// Gets the maximum time offset error accepted for dates reported by clients, in milliseconds.
+        /// </summary>
+        public long TimeSyncOffset { get; } = 2000;
+
+        /// <summary>
+        /// Gets the maximum offset error accepted for position reported by clients, in milliseconds.
+        /// </summary>
+        public long MaxPlaybackOffset { get; } = 500;
 
         /// <summary>
         /// Gets the group identifier.
@@ -88,7 +112,7 @@ namespace Emby.Server.Implementations.SyncPlay
         public PlayQueueManager PlayQueue { get; } = new PlayQueueManager();
 
         /// <summary>
-        /// Gets or sets the runtime ticks of current playing item.
+        /// Gets the runtime ticks of current playing item.
         /// </summary>
         /// <value>The runtime ticks of current playing item.</value>
         public long RunTimeTicks { get; private set; }
@@ -112,30 +136,6 @@ namespace Emby.Server.Implementations.SyncPlay
         public Dictionary<string, GroupMember> Participants { get; } =
             new Dictionary<string, GroupMember>(StringComparer.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SyncPlayGroupController" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="sessionManager">The session manager.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="syncPlayManager">The SyncPlay manager.</param>
-        public SyncPlayGroupController(
-            ILogger logger,
-            IUserManager userManager,
-            ISessionManager sessionManager,
-            ILibraryManager libraryManager,
-            ISyncPlayManager syncPlayManager)
-        {
-            _logger = logger;
-            _userManager = userManager;
-            _sessionManager = sessionManager;
-            _libraryManager = libraryManager;
-            _syncPlayManager = syncPlayManager;
-
-            State = new IdleGroupState(_logger);
-        }
-
         /// <summary>
         /// Adds the session to the group.
         /// </summary>
@@ -167,34 +167,32 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <param name="from">The current session.</param>
         /// <param name="type">The filtering type.</param>
         /// <returns>The array of sessions matching the filter.</returns>
-        private SessionInfo[] FilterSessions(SessionInfo from, SyncPlayBroadcastType type)
-        {
-            switch (type)
-            {
-                case SyncPlayBroadcastType.CurrentSession:
-                    return new SessionInfo[] { from };
-                case SyncPlayBroadcastType.AllGroup:
-                    return Participants
-                        .Values
-                        .Select(session => session.Session)
-                        .ToArray();
-                case SyncPlayBroadcastType.AllExceptCurrentSession:
-                    return Participants
-                        .Values
-                        .Select(session => session.Session)
-                        .Where(session => !session.Id.Equals(from.Id))
-                        .ToArray();
-                case SyncPlayBroadcastType.AllReady:
-                    return Participants
-                        .Values
-                        .Where(session => !session.IsBuffering)
-                        .Select(session => session.Session)
-                        .ToArray();
-                default:
-                    return Array.Empty<SessionInfo>();
-            }
+        private IEnumerable<SessionInfo> FilterSessions(SessionInfo from, SyncPlayBroadcastType type)
+        {
+            return type switch
+            {
+                SyncPlayBroadcastType.CurrentSession => new SessionInfo[] { from },
+                SyncPlayBroadcastType.AllGroup => Participants
+                    .Values
+                    .Select(session => session.Session),
+                SyncPlayBroadcastType.AllExceptCurrentSession => Participants
+                    .Values
+                    .Select(session => session.Session)
+                    .Where(session => !session.Id.Equals(from.Id, StringComparison.OrdinalIgnoreCase)),
+                SyncPlayBroadcastType.AllReady => Participants
+                    .Values
+                    .Where(session => !session.IsBuffering)
+                    .Select(session => session.Session),
+                _ => Enumerable.Empty<SessionInfo>()
+            };
         }
 
+        /// <summary>
+        /// Checks if a given user can access a given item, that is, the user has access to a folder where the item is stored.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="item">The item.</param>
+        /// <returns><c>true</c> if the user can access the item, <c>false</c> otherwise.</returns>
         private bool HasAccessToItem(User user, BaseItem item)
         {
             var collections = _libraryManager.GetCollectionFolders(item)
@@ -202,41 +200,42 @@ namespace Emby.Server.Implementations.SyncPlay
             return collections.Intersect(user.GetPreference(PreferenceKind.EnabledFolders)).Any();
         }
 
-        private bool HasAccessToQueue(User user, Guid[] queue)
+        /// <summary>
+        /// Checks if a given user can access all items of a given queue, that is,
+        /// the user has the required minimum parental access and has access to all required folders.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="queue">The queue.</param>
+        /// <returns><c>true</c> if the user can access all the items in the queue, <c>false</c> otherwise.</returns>
+        private bool HasAccessToQueue(User user, IEnumerable<Guid> queue)
         {
-            if (queue == null || queue.Length == 0)
+            // Check if queue is empty.
+            if (!queue?.Any() ?? true)
             {
                 return true;
             }
 
-            var items = queue.ToList()
-                .Select(item => _libraryManager.GetItemById(item));
-
-            // Find the highest rating value, which becomes the required minimum for the user.
-            var MinParentalRatingAccessRequired = items
-                .Select(item => item.InheritedParentalRatingValue)
-                .Min();
-
-            // Check ParentalRating access, user must have the minimum required access level.
-            var hasParentalRatingAccess = !user.MaxParentalAgeRating.HasValue
-                || MinParentalRatingAccessRequired <= user.MaxParentalAgeRating;
-
-            // Check that user has access to all required folders.
-            if (!user.HasPermission(PermissionKind.EnableAllFolders) && hasParentalRatingAccess)
+            foreach (var itemId in queue)
             {
-                // Get list of items that are not accessible.
-                var blockedItems = items.Where(item => !HasAccessToItem(user, item));
+                var item = _libraryManager.GetItemById(itemId);
+                if (user.MaxParentalAgeRating.HasValue && item.InheritedParentalRatingValue > user.MaxParentalAgeRating)
+                {
+                    return false;
+                }
 
-                // We need the user to be able to access all items.
-                return !blockedItems.Any();
+                if (!user.HasPermission(PermissionKind.EnableAllFolders) && !HasAccessToItem(user, item))
+                {
+                    return false;
+                }
             }
 
-            return hasParentalRatingAccess;
+            return true;
         }
 
-        private bool AllUsersHaveAccessToQueue(Guid[] queue)
+        private bool AllUsersHaveAccessToQueue(IEnumerable<Guid> queue)
         {
-            if (queue == null || queue.Length == 0)
+            // Check if queue is empty.
+            if (!queue?.Any() ?? true)
             {
                 return true;
             }
@@ -269,7 +268,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             if (sessionIsPlayingAnItem)
             {
-                var playlist = session.NowPlayingQueue.Select(item => item.Id).ToArray();
+                var playlist = session.NowPlayingQueue.Select(item => item.Id);
                 PlayQueue.Reset();
                 PlayQueue.SetPlaylist(playlist);
                 PlayQueue.SetPlayingItemById(session.FullNowPlayingItem.Id);
@@ -277,17 +276,19 @@ namespace Emby.Server.Implementations.SyncPlay
                 PositionTicks = session.PlayState.PositionTicks ?? 0;
 
                 // Mantain playstate.
-                var waitingState = new WaitingGroupState(_logger);
-                waitingState.ResumePlaying = !session.PlayState.IsPaused;
+                var waitingState = new WaitingGroupState(_logger)
+                {
+                    ResumePlaying = !session.PlayState.IsPaused
+                };
                 SetState(waitingState);
             }
 
             var updateSession = NewSyncPlayGroupUpdate(GroupUpdateType.GroupJoined, GetInfo());
             SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
 
-            State.SessionJoined(this, State.GetGroupState(), session, cancellationToken);
+            _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("InitGroup: {0} created group {1}.", session.Id.ToString(), GroupId.ToString());
+            _logger.LogInformation("InitGroup: {0} created group {1}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
@@ -302,9 +303,9 @@ namespace Emby.Server.Implementations.SyncPlay
             var updateOthers = NewSyncPlayGroupUpdate(GroupUpdateType.UserJoined, session.UserName);
             SendGroupUpdate(session, SyncPlayBroadcastType.AllExceptCurrentSession, updateOthers, cancellationToken);
 
-            State.SessionJoined(this, State.GetGroupState(), session, cancellationToken);
+            _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("SessionJoin: {0} joined group {1}.", session.Id.ToString(), GroupId.ToString());
+            _logger.LogInformation("SessionJoin: {0} joined group {1}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
@@ -316,15 +317,15 @@ namespace Emby.Server.Implementations.SyncPlay
             var updateOthers = NewSyncPlayGroupUpdate(GroupUpdateType.UserJoined, session.UserName);
             SendGroupUpdate(session, SyncPlayBroadcastType.AllExceptCurrentSession, updateOthers, cancellationToken);
 
-            State.SessionJoined(this, State.GetGroupState(), session, cancellationToken);
+            _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("SessionRestore: {0} re-joined group {1}.", session.Id.ToString(), GroupId.ToString());
+            _logger.LogInformation("SessionRestore: {0} re-joined group {1}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
         public void SessionLeave(SessionInfo session, CancellationToken cancellationToken)
         {
-            State.SessionLeaving(this, State.GetGroupState(), session, cancellationToken);
+            _state.SessionLeaving(this, _state.Type, session, cancellationToken);
 
             RemoveSession(session);
             _syncPlayManager.RemoveSessionFromGroup(session, this);
@@ -335,18 +336,17 @@ namespace Emby.Server.Implementations.SyncPlay
             var updateOthers = NewSyncPlayGroupUpdate(GroupUpdateType.UserLeft, session.UserName);
             SendGroupUpdate(session, SyncPlayBroadcastType.AllExceptCurrentSession, updateOthers, cancellationToken);
 
-            _logger.LogInformation("SessionLeave: {0} left group {1}.", session.Id.ToString(), GroupId.ToString());
+            _logger.LogInformation("SessionLeave: {0} left group {1}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
-        public void HandleRequest(SessionInfo session, IPlaybackGroupRequest request, CancellationToken cancellationToken)
+        public void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken)
         {
             // The server's job is to maintain a consistent state for clients to reference
             // and notify clients of state changes. The actual syncing of media playback
             // happens client side. Clients are aware of the server's time and use it to sync.
-            _logger.LogInformation("HandleRequest: {0} requested {1}, group {2} in {3} state.",
-                session.Id.ToString(), request.GetRequestType(), GroupId.ToString(), State.GetGroupState());
-            request.Apply(this, State, session, cancellationToken);
+            _logger.LogInformation("HandleRequest: {0} requested {1}, group {2} in {3} state.", session.Id, request.Type, GroupId.ToString(), _state.Type);
+            request.Apply(this, _state, session, cancellationToken);
         }
 
         /// <inheritdoc />
@@ -356,7 +356,7 @@ namespace Emby.Server.Implementations.SyncPlay
             {
                 GroupId = GroupId.ToString(),
                 GroupName = GroupName,
-                State = State.GetGroupState(),
+                State = _state.Type,
                 Participants = Participants.Values.Select(session => session.Session.UserName).Distinct().ToList(),
                 LastUpdatedAt = DateToUTCString(DateTime.UtcNow)
             };
@@ -365,7 +365,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public bool HasAccessToPlayQueue(User user)
         {
-            var items = PlayQueue.GetPlaylist().Select(item => item.ItemId).ToArray();
+            var items = PlayQueue.GetPlaylist().Select(item => item.ItemId);
             return HasAccessToQueue(user, items);
         }
 
@@ -381,10 +381,10 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SetState(ISyncPlayState state)
+        public void SetState(IGroupState state)
         {
-            _logger.LogInformation("SetState: {0} switching from {1} to {2}.", GroupId.ToString(), State.GetGroupState(), state.GetGroupState());
-            this.State = state;
+            _logger.LogInformation("SetState: {0} switching from {1} to {2}.", GroupId.ToString(), _state.Type, state.Type);
+            this._state = state;
         }
 
         /// <inheritdoc />
@@ -443,16 +443,14 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public string DateToUTCString(DateTime dateTime)
         {
-            return dateTime.ToUniversalTime().ToString("o");
+            return dateTime.ToUniversalTime().ToString("o", CultureInfo.InvariantCulture);
         }
 
         /// <inheritdoc />
         public long SanitizePositionTicks(long? positionTicks)
         {
             var ticks = positionTicks ?? 0;
-            ticks = Math.Max(ticks, 0);
-            ticks = Math.Min(ticks, RunTimeTicks);
-            return ticks;
+            return Math.Clamp(ticks, 0, RunTimeTicks);
         }
 
         /// <inheritdoc />
@@ -509,10 +507,10 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool SetPlayQueue(Guid[] playQueue, int playingItemPosition, long startPositionTicks)
+        public bool SetPlayQueue(IEnumerable<Guid> playQueue, int playingItemPosition, long startPositionTicks)
         {
             // Ignore on empty queue or invalid item position.
-            if (playQueue.Length < 1 || playingItemPosition >= playQueue.Length || playingItemPosition < 0)
+            if (!playQueue.Any() || playingItemPosition >= playQueue.Count() || playingItemPosition < 0)
             {
                 return false;
             }
@@ -555,7 +553,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool RemoveFromPlayQueue(string[] playlistItemIds)
+        public bool RemoveFromPlayQueue(IEnumerable<string> playlistItemIds)
         {
             var playingItemRemoved = PlayQueue.RemoveFromPlaylist(playlistItemIds);
             if (playingItemRemoved)
@@ -584,10 +582,10 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool AddToPlayQueue(Guid[] newItems, string mode)
+        public bool AddToPlayQueue(IEnumerable<Guid> newItems, string mode)
         {
             // Ignore on empty list.
-            if (newItems.Length < 1)
+            if (!newItems.Any())
             {
                 return false;
             }
@@ -598,7 +596,7 @@ namespace Emby.Server.Implementations.SyncPlay
                 return false;
             }
 
-            if (mode.Equals("next"))
+            if (mode.Equals("next", StringComparison.OrdinalIgnoreCase))
             {
                 PlayQueue.QueueNext(newItems);
             }
@@ -652,7 +650,8 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SetRepeatMode(string mode) {
+        public void SetRepeatMode(string mode)
+        {
             switch (mode)
             {
                 case "RepeatOne":
@@ -669,7 +668,8 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SetShuffleMode(string mode) {
+        public void SetShuffleMode(string mode)
+        {
             switch (mode)
             {
                 case "Shuffle":
@@ -687,7 +687,7 @@ namespace Emby.Server.Implementations.SyncPlay
         {
             var startPositionTicks = PositionTicks;
 
-            if (State.GetGroupState().Equals(GroupState.Playing))
+            if (_state.Type.Equals(GroupStateType.Playing))
             {
                 var currentTime = DateTime.UtcNow;
                 var elapsedTime = currentTime - LastActivity;
@@ -711,6 +711,5 @@ namespace Emby.Server.Implementations.SyncPlay
                 RepeatMode = PlayQueue.RepeatMode
             };
         }
-
     }
 }
diff --git a/Emby.Server.Implementations/SyncPlay/GroupStates/AbstractGroupState.cs b/Emby.Server.Implementations/SyncPlay/GroupStates/AbstractGroupState.cs
deleted file mode 100644
index 26cd51b8d..000000000
--- a/Emby.Server.Implementations/SyncPlay/GroupStates/AbstractGroupState.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class AbstractGroupState.
-    /// </summary>
-    /// <remarks>
-    /// Class is not thread-safe, external locking is required when accessing methods.
-    /// </remarks>
-    public abstract class AbstractGroupState : ISyncPlayState
-    {
-        /// <summary>
-        /// The logger.
-        /// </summary>
-        protected readonly ILogger _logger;
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public AbstractGroupState(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Sends a group state update to all group.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="reason">The reason of the state change.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        protected void SendGroupStateUpdate(ISyncPlayStateContext context, IPlaybackGroupRequest reason, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Notify relevant state change event.
-            var stateUpdate = new GroupStateUpdate()
-            {
-                State = GetGroupState(),
-                Reason = reason.GetRequestType()
-            };
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.StateUpdate, stateUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public abstract GroupState GetGroupState();
-
-        /// <inheritdoc />
-        public abstract void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <inheritdoc />
-        public abstract void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, IPlaybackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, RemoveFromPlaylistGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            var playingItemRemoved = context.RemoveFromPlayQueue(request.PlaylistItemIds);
-
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.RemoveItems);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-            if (playingItemRemoved)
-            {
-                var PlayingItemIndex = context.PlayQueue.PlayingItemIndex;
-                if (context.PlayQueue.PlayingItemIndex == -1)
-                {
-                    _logger.LogDebug("HandleRequest: {0} in group {1}, play queue is empty.", request.GetRequestType(), context.GroupId.ToString());
-
-                    ISyncPlayState idleState = new IdleGroupState(_logger);
-                    context.SetState(idleState);
-                    var stopRequest = new StopGroupRequest();
-                    idleState.HandleRequest(context, GetGroupState(), stopRequest, session, cancellationToken);
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, MovePlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            var result = context.MoveItemInPlayQueue(request.PlaylistItemId, request.NewIndex);
-
-            if (!result)
-            {
-                _logger.LogError("HandleRequest: {0} in group {1}, unable to move item in play queue.", request.GetRequestType(), context.GroupId.ToString());
-                return;
-            }
-
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.MoveItem);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, QueueGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            var result = context.AddToPlayQueue(request.ItemIds, request.Mode);
-
-            if (!result)
-            {
-                _logger.LogError("HandleRequest: {0} in group {1}, unable to add items to play queue.", request.GetRequestType(), context.GroupId.ToString());
-                return;
-            }
-
-            var reason = request.Mode.Equals("next") ? PlayQueueUpdateReason.QueueNext : PlayQueueUpdateReason.Queue;
-            var playQueueUpdate = context.GetPlayQueueUpdate(reason);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            UnhandledRequest(request);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetRepeatModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            context.SetRepeatMode(request.Mode);
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.RepeatMode);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetShuffleModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            context.SetShuffleMode(request.Mode);
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.ShuffleMode);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PingGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Collected pings are used to account for network latency when unpausing playback.
-            context.UpdatePing(session, request.Ping);
-        }
-
-        /// <inheritdoc />
-        public virtual void HandleRequest(ISyncPlayStateContext context, GroupState prevState, IgnoreWaitGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            context.SetIgnoreGroupWait(session, request.IgnoreWait);
-        }
-
-        private void UnhandledRequest(IPlaybackGroupRequest request)
-        {
-            _logger.LogWarning("HandleRequest: unhandled {0} request for {1} state.", request.GetRequestType(), GetGroupState());
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/SyncPlay/GroupStates/IdleGroupState.cs b/Emby.Server.Implementations/SyncPlay/GroupStates/IdleGroupState.cs
deleted file mode 100644
index 70fe3e006..000000000
--- a/Emby.Server.Implementations/SyncPlay/GroupStates/IdleGroupState.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class IdleGroupState.
-    /// </summary>
-    /// <remarks>
-    /// Class is not thread-safe, external locking is required when accessing methods.
-    /// </remarks>
-    public class IdleGroupState : AbstractGroupState
-    {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public IdleGroupState(ILogger logger)
-            : base(logger)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override GroupState GetGroupState()
-        {
-            return GroupState.Idle;
-        }
-
-        /// <inheritdoc />
-        public override void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, GetGroupState(), session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, prevState, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, prevState, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, prevState, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, prevState, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            SendStopCommand(context, prevState, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        private void SendStopCommand(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            var command = context.NewSyncPlayCommand(SendCommandType.Stop);
-            if (!prevState.Equals(GetGroupState()))
-            {
-                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-            }
-            else
-            {
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/SyncPlay/GroupStates/PausedGroupState.cs b/Emby.Server.Implementations/SyncPlay/GroupStates/PausedGroupState.cs
deleted file mode 100644
index ca2cb0988..000000000
--- a/Emby.Server.Implementations/SyncPlay/GroupStates/PausedGroupState.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PausedGroupState.
-    /// </summary>
-    /// <remarks>
-    /// Class is not thread-safe, external locking is required when accessing methods.
-    /// </remarks>
-    public class PausedGroupState : AbstractGroupState
-    {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public PausedGroupState(ILogger logger)
-            : base(logger)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override GroupState GetGroupState()
-        {
-            return GroupState.Paused;
-        }
-
-        /// <inheritdoc />
-        public override void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Wait for session to be ready.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.SessionJoined(context, GetGroupState(), session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var playingState = new PlayingGroupState(_logger);
-            context.SetState(playingState);
-            playingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            if (!prevState.Equals(GetGroupState()))
-            {
-                // Pause group and compute the media playback position.
-                var currentTime = DateTime.UtcNow;
-                var elapsedTime = currentTime - context.LastActivity;
-                context.LastActivity = currentTime;
-                // Elapsed time is negative if event happens
-                // during the delay added to account for latency.
-                // In this phase clients haven't started the playback yet.
-                // In other words, LastActivity is in the future,
-                // when playback unpause is supposed to happen.
-                // Seek only if playback actually started.
-                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
-
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-
-                // Notify relevant state change event.
-                SendGroupStateUpdate(context, request, session, cancellationToken);
-            }
-            else
-            {
-                // Client got lost, sending current state.
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var idleState = new IdleGroupState(_logger);
-            context.SetState(idleState);
-            idleState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            if (prevState.Equals(GetGroupState()))
-            {
-                // Client got lost, sending current state.
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-            else if (prevState.Equals(GroupState.Waiting))
-            {
-                // Sending current state to all clients.
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-
-                // Notify relevant state change event.
-                SendGroupStateUpdate(context, request, session, cancellationToken);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/SyncPlay/GroupStates/PlayingGroupState.cs b/Emby.Server.Implementations/SyncPlay/GroupStates/PlayingGroupState.cs
deleted file mode 100644
index 85119669d..000000000
--- a/Emby.Server.Implementations/SyncPlay/GroupStates/PlayingGroupState.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PlayingGroupState.
-    /// </summary>
-    /// <remarks>
-    /// Class is not thread-safe, external locking is required when accessing methods.
-    /// </remarks>
-    public class PlayingGroupState : AbstractGroupState
-    {
-        /// <summary>
-        /// Ignore requests for buffering.
-        /// </summary>
-        public bool IgnoreBuffering { get; set; }
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public PlayingGroupState(ILogger logger)
-            : base(logger)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override GroupState GetGroupState()
-        {
-            return GroupState.Playing;
-        }
-
-        /// <inheritdoc />
-        public override void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Wait for session to be ready.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.SessionJoined(context, GetGroupState(), session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            if (!prevState.Equals(GetGroupState()))
-            {
-                // Pick a suitable time that accounts for latency.
-                var delayMillis = Math.Max(context.GetHighestPing() * 2, context.DefaultPing);
-
-                // Unpause group and set starting point in future.
-                // Clients will start playback at LastActivity (datetime) from PositionTicks (playback position).
-                // The added delay does not guarantee, of course, that the command will be received in time.
-                // Playback synchronization will mainly happen client side.
-                context.LastActivity = DateTime.UtcNow.AddMilliseconds(
-                    delayMillis
-                );
-
-                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
-                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-
-                // Notify relevant state change event.
-                SendGroupStateUpdate(context, request, session, cancellationToken);
-            }
-            else
-            {
-                // Client got lost, sending current state.
-                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var pausedState = new PausedGroupState(_logger);
-            context.SetState(pausedState);
-            pausedState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var idleState = new IdleGroupState(_logger);
-            context.SetState(idleState);
-            idleState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            if (IgnoreBuffering)
-            {
-                return;
-            }
-
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            if (prevState.Equals(GetGroupState()))
-            {
-                // Group was not waiting, make sure client has latest state.
-                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-            else if (prevState.Equals(GroupState.Waiting))
-            {
-                // Notify relevant state change event.
-                SendGroupStateUpdate(context, request, session, cancellationToken);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Change state.
-            var waitingState = new WaitingGroupState(_logger);
-            context.SetState(waitingState);
-            waitingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/SyncPlay/GroupStates/WaitingGroupState.cs b/Emby.Server.Implementations/SyncPlay/GroupStates/WaitingGroupState.cs
deleted file mode 100644
index bc3cc4918..000000000
--- a/Emby.Server.Implementations/SyncPlay/GroupStates/WaitingGroupState.cs
+++ /dev/null
@@ -1,683 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class WaitingGroupState.
-    /// </summary>
-    /// <remarks>
-    /// Class is not thread-safe, external locking is required when accessing methods.
-    /// </remarks>
-    public class WaitingGroupState : AbstractGroupState
-    {
-        /// <summary>
-        /// Tells the state to switch to after buffering is done.
-        /// </summary>
-        public bool ResumePlaying { get; set; } = false;
-
-        /// <summary>
-        /// Whether the initial state has been set.
-        /// </summary>
-        private bool InitialStateSet { get; set; } = false;
-
-        /// <summary>
-        /// The group state before the first ever event.
-        /// </summary>
-        private GroupState InitialState { get; set; }
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public WaitingGroupState(ILogger logger)
-            : base(logger)
-        {
-            // Do nothing.
-        }
-
-        /// <inheritdoc />
-        public override GroupState GetGroupState()
-        {
-            return GroupState.Waiting;
-        }
-
-        /// <inheritdoc />
-        public override void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            if (prevState.Equals(GroupState.Playing)) {
-                ResumePlaying = true;
-                // Pause group and compute the media playback position.
-                var currentTime = DateTime.UtcNow;
-                var elapsedTime = currentTime - context.LastActivity;
-                context.LastActivity = currentTime;
-                // Elapsed time is negative if event happens
-                // during the delay added to account for latency.
-                // In this phase clients haven't started the playback yet.
-                // In other words, LastActivity is in the future,
-                // when playback unpause is supposed to happen.
-                // Seek only if playback actually started.
-                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
-            }
-
-            // Prepare new session.
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, update, cancellationToken);
-
-            context.SetBuffering(session, true);
-
-            // Send pause command to all non-buffering sessions.
-            var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-            context.SendCommand(session, SyncPlayBroadcastType.AllReady, command, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            context.SetBuffering(session, false);
-
-            if (!context.IsBuffering())
-            {
-                if (ResumePlaying)
-                {
-                    // Client, that was buffering, left the group.
-                    var playingState = new PlayingGroupState(_logger);
-                    context.SetState(playingState);
-                    var unpauseRequest = new UnpauseGroupRequest();
-                    playingState.HandleRequest(context, GetGroupState(), unpauseRequest, session, cancellationToken);
-
-                    _logger.LogDebug("SessionLeaving: {0} left the group {1}, notifying others to resume.", session.Id.ToString(), context.GroupId.ToString());
-                }
-                else
-                {
-                    // Group is ready, returning to previous state.
-                    var pausedState = new PausedGroupState(_logger);
-                    context.SetState(pausedState);
-
-                    _logger.LogDebug("SessionLeaving: {0} left the group {1}, returning to previous state.", session.Id.ToString(), context.GroupId.ToString());
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            ResumePlaying = true;
-
-            var setQueueStatus = context.SetPlayQueue(request.PlayingQueue, request.PlayingItemPosition, request.StartPositionTicks);
-            if (!setQueueStatus)
-            {
-                _logger.LogError("HandleRequest: {0} in group {1}, unable to set playing queue.", request.GetRequestType(), context.GroupId.ToString());
-
-                // Ignore request and return to previous state.
-                ISyncPlayState newState;
-                switch (prevState)
-                {
-                    case GroupState.Playing:
-                        newState = new PlayingGroupState(_logger);
-                        break;
-                    case GroupState.Paused:
-                        newState = new PausedGroupState(_logger);
-                        break;
-                    default:
-                        newState = new IdleGroupState(_logger);
-                        break;
-                }
-
-                context.SetState(newState);
-                return;
-            }
-
-            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
-            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-            // Reset status of sessions and await for all Ready events.
-            context.SetAllBuffering(true);
-
-            _logger.LogDebug("HandleRequest: {0} in group {1}, {2} set a new play queue.", request.GetRequestType(), context.GroupId.ToString(), session.Id.ToString());
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            ResumePlaying = true;
-
-            var result = context.SetPlayingItem(request.PlaylistItemId);
-            if (result)
-            {
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
-                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-                // Reset status of sessions and await for all Ready events.
-                context.SetAllBuffering(true);
-            }
-            else
-            {
-                // Return to old state.
-                ISyncPlayState newState;
-                switch (prevState)
-                {
-                    case GroupState.Playing:
-                        newState = new PlayingGroupState(_logger);
-                        break;
-                    case GroupState.Paused:
-                        newState = new PausedGroupState(_logger);
-                        break;
-                    default:
-                        newState = new IdleGroupState(_logger);
-                        break;
-                }
-
-                context.SetState(newState);
-
-                _logger.LogDebug("HandleRequest: {0} in group {1}, unable to change current playing item.", request.GetRequestType(), context.GroupId.ToString());
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            if (prevState.Equals(GroupState.Idle))
-            {
-                ResumePlaying = true;
-                context.RestartCurrentItem();
-
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
-                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-                // Reset status of sessions and await for all Ready events.
-                context.SetAllBuffering(true);
-
-                _logger.LogDebug("HandleRequest: {0} in group {1}, waiting for all ready events.", request.GetRequestType(), context.GroupId.ToString());
-            }
-            else
-            {
-                if (ResumePlaying)
-                {
-                    _logger.LogDebug("HandleRequest: {0} in group {1}, ignoring sessions that are not ready and forcing the playback to start.", request.GetRequestType(), context.GroupId.ToString());
-
-                    // An Unpause request is forcing the playback to start, ignoring sessions that are not ready.
-                    context.SetAllBuffering(false);
-
-                    // Change state.
-                    var playingState = new PlayingGroupState(_logger);
-                    playingState.IgnoreBuffering = true;
-                    context.SetState(playingState);
-                    playingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-                }
-                else
-                {
-                    // Group would have gone to paused state, now will go to playing state when ready.
-                    ResumePlaying = true;
-
-                    // Notify relevant state change event.
-                    SendGroupStateUpdate(context, request, session, cancellationToken);
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            // Wait for sessions to be ready, then switch to paused state.
-            ResumePlaying = false;
-
-            // Notify relevant state change event.
-            SendGroupStateUpdate(context, request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            // Change state.
-            var idleState = new IdleGroupState(_logger);
-            context.SetState(idleState);
-            idleState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            if (prevState.Equals(GroupState.Playing))
-            {
-                ResumePlaying = true;
-            }
-            else if(prevState.Equals(GroupState.Paused))
-            {
-                ResumePlaying = false;
-            }
-
-            // Sanitize PositionTicks.
-            var ticks = context.SanitizePositionTicks(request.PositionTicks);
-
-            // Seek.
-            context.PositionTicks = ticks;
-            context.LastActivity = DateTime.UtcNow;
-
-            var command = context.NewSyncPlayCommand(SendCommandType.Seek);
-            context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-
-            // Reset status of sessions and await for all Ready events.
-            context.SetAllBuffering(true);
-
-            // Notify relevant state change event.
-            SendGroupStateUpdate(context, request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            // Make sure the client is playing the correct item.
-            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId()))
-            {
-                _logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.GetRequestType(), context.GroupId.ToString(), session.Id.ToString());
-
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
-                var updateSession = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
-                context.SetBuffering(session, true);
-
-                return;
-            }
-
-            if (prevState.Equals(GroupState.Playing))
-            {
-                // Resume playback when all ready.
-                ResumePlaying = true;
-
-                context.SetBuffering(session, true);
-
-                // Pause group and compute the media playback position.
-                var currentTime = DateTime.UtcNow;
-                var elapsedTime = currentTime - context.LastActivity;
-                context.LastActivity = currentTime;
-                // Elapsed time is negative if event happens
-                // during the delay added to account for latency.
-                // In this phase clients haven't started the playback yet.
-                // In other words, LastActivity is in the future,
-                // when playback unpause is supposed to happen.
-                // Seek only if playback actually started.
-                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
-
-                // Send pause command to all non-buffering sessions.
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.AllReady, command, cancellationToken);
-            }
-            else if (prevState.Equals(GroupState.Paused))
-            {
-                // Don't resume playback when all ready.
-                ResumePlaying = false;
-
-                context.SetBuffering(session, true);
-
-                // Send pause command to buffering session.
-                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-            }
-            else if (prevState.Equals(GroupState.Waiting))
-            {
-                // Another session is now buffering.
-                context.SetBuffering(session, true);
-
-                if (!ResumePlaying)
-                {
-                    // Force update for this session that should be paused.
-                    var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-                }
-            }
-
-            // Notify relevant state change event.
-            SendGroupStateUpdate(context, request, session, cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            // Make sure the client is playing the correct item.
-            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId()))
-            {
-                _logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.GetRequestType(), context.GroupId.ToString(), session.Id.ToString());
-
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
-                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, update, cancellationToken);
-                context.SetBuffering(session, true);
-
-                return;
-            }
-
-            // Compute elapsed time between the client reported time and now.
-            // Elapsed time is used to estimate the client position when playback is unpaused.
-            // Ideally, the request is received and handled without major delays.
-            // However, to avoid waiting indefinitely when a client is not reporting a correct time,
-            // the elapsed time is ignored after a certain threshold.
-            var currentTime = DateTime.UtcNow;
-            var elapsedTime = currentTime.Subtract(request.When);
-            var timeSyncThresholdTicks = TimeSpan.FromMilliseconds(context.TimeSyncOffset).Ticks;
-            if (Math.Abs(elapsedTime.Ticks) > timeSyncThresholdTicks)
-            {
-                _logger.LogWarning("HandleRequest: {0} in group {1}, {2} is not time syncing properly. Ignoring elapsed time.",
-                    request.GetRequestType(), context.GroupId.ToString(), session.Id);
-
-                elapsedTime = TimeSpan.Zero;
-            }
-
-            // Ignore elapsed time if client is paused.
-            if (!request.IsPlaying)
-            {
-                elapsedTime = TimeSpan.Zero;
-            }
-
-            var requestTicks = context.SanitizePositionTicks(request.PositionTicks);
-            var clientPosition = TimeSpan.FromTicks(requestTicks) + elapsedTime;
-            var delayTicks = context.PositionTicks - clientPosition.Ticks;
-            var maxPlaybackOffsetTicks = TimeSpan.FromMilliseconds(context.MaxPlaybackOffset).Ticks;
-
-            _logger.LogDebug("HandleRequest: {0} in group {1}, {2} at {3} (delay of {4} seconds).",
-                request.GetRequestType(), context.GroupId.ToString(), session.Id, clientPosition, TimeSpan.FromTicks(delayTicks).TotalSeconds);
-
-            if (ResumePlaying)
-            {
-                // Handle case where session reported as ready but in reality
-                // it has no clue of the real position nor the playback state.
-                if (!request.IsPlaying && Math.Abs(delayTicks) > maxPlaybackOffsetTicks)
-                {
-                    // Session not ready at all.
-                    context.SetBuffering(session, true);
-
-                    // Correcting session's position.
-                    var command = context.NewSyncPlayCommand(SendCommandType.Seek);
-                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-
-                    // Notify relevant state change event.
-                    SendGroupStateUpdate(context, request, session, cancellationToken);
-
-                    _logger.LogWarning("HandleRequest: {0} in group {1}, {2} got lost in time, correcting.",
-                        request.GetRequestType(), context.GroupId.ToString(), session.Id);
-                    return;
-                }
-
-                // Session is ready.
-                context.SetBuffering(session, false);
-
-                if (context.IsBuffering())
-                {
-                    // Others are still buffering, tell this client to pause when ready.
-                    var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                    var pauseAtTime = currentTime.AddTicks(delayTicks);
-                    command.When = context.DateToUTCString(pauseAtTime);
-                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-
-                    _logger.LogInformation("HandleRequest: {0} in group {1}, others still buffering, {2} will pause when ready in {3} seconds.",
-                        request.GetRequestType(), context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
-                }
-                else
-                {
-                    // If all ready, then start playback.
-                    // Let other clients resume as soon as the buffering client catches up.
-                    if (delayTicks > context.GetHighestPing() * 2 * TimeSpan.TicksPerMillisecond)
-                    {
-                        // Client that was buffering is recovering, notifying others to resume.
-                        context.LastActivity = currentTime.AddTicks(delayTicks);
-                        var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
-                        var filter = SyncPlayBroadcastType.AllExceptCurrentSession;
-                        if (!request.IsPlaying)
-                        {
-                            filter = SyncPlayBroadcastType.AllGroup;
-                        }
-
-                        context.SendCommand(session, filter, command, cancellationToken);
-
-                        _logger.LogInformation("HandleRequest: {0} in group {1}, {2} is recovering, notifying others to resume in {3} seconds.",
-                            request.GetRequestType(), context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
-                    }
-                    else
-                    {
-                        // Client, that was buffering, resumed playback but did not update others in time.
-                        delayTicks = context.GetHighestPing() * 2 * TimeSpan.TicksPerMillisecond;
-                        delayTicks = Math.Max(delayTicks, context.DefaultPing);
-
-                        context.LastActivity = currentTime.AddTicks(delayTicks);
-
-                        var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
-                        context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
-
-                        _logger.LogWarning("HandleRequest: {0} in group {1}, {2} resumed playback but did not update others in time. {3} seconds to recover.",
-                            request.GetRequestType(), context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
-                    }
-
-                    // Change state.
-                    var playingState = new PlayingGroupState(_logger);
-                    context.SetState(playingState);
-                    playingState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-                }
-            }
-            else
-            {
-                // Check that session is really ready, tollerate player imperfections under a certain threshold.
-                if (Math.Abs(context.PositionTicks - requestTicks) > maxPlaybackOffsetTicks)
-                {
-                    // Session still not ready.
-                    context.SetBuffering(session, true);
-                    // Session is seeking to wrong position, correcting.
-                    var command = context.NewSyncPlayCommand(SendCommandType.Seek);
-                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
-
-                    // Notify relevant state change event.
-                    SendGroupStateUpdate(context, request, session, cancellationToken);
-
-                    _logger.LogWarning("HandleRequest: {0} in group {1}, {2} was seeking to wrong position, correcting.",
-                        request.GetRequestType(), context.GroupId.ToString(), session.Id);
-                    return;
-                } else {
-                    // Session is ready.
-                    context.SetBuffering(session, false);
-                }
-
-                if (!context.IsBuffering())
-                {
-                    // Group is ready, returning to previous state.
-                    var pausedState = new PausedGroupState(_logger);
-                    context.SetState(pausedState);
-
-                    if (InitialState.Equals(GroupState.Playing))
-                    {
-                        // Group went from playing to waiting state and a pause request occured while waiting.
-                        var pauserequest = new PauseGroupRequest();
-                        pausedState.HandleRequest(context, GetGroupState(), pauserequest, session, cancellationToken);
-                    }
-                    else if (InitialState.Equals(GroupState.Paused))
-                    {
-                        pausedState.HandleRequest(context, GetGroupState(), request, session, cancellationToken);
-                    }
-
-                    _logger.LogDebug("HandleRequest: {0} in group {1}, {2} is ready, returning to previous state.",
-                        request.GetRequestType(), context.GroupId.ToString(), session.Id);
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            ResumePlaying = true;
-
-            // Make sure the client knows the playing item, to avoid duplicate requests.
-            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId()))
-            {
-                _logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.GetRequestType(), context.GroupId.ToString());
-                return;
-            }
-
-            var newItem = context.NextItemInQueue();
-            if (newItem)
-            {
-                // Send playing-queue update.
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextTrack);
-                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-                // Reset status of sessions and await for all Ready events.
-                context.SetAllBuffering(true);
-            }
-            else
-            {
-                // Return to old state.
-                ISyncPlayState newState;
-                switch (prevState)
-                {
-                    case GroupState.Playing:
-                        newState = new PlayingGroupState(_logger);
-                        break;
-                    case GroupState.Paused:
-                        newState = new PausedGroupState(_logger);
-                        break;
-                    default:
-                        newState = new IdleGroupState(_logger);
-                        break;
-                }
-
-                context.SetState(newState);
-
-                _logger.LogDebug("HandleRequest: {0} in group {1}, no next track available.", request.GetRequestType(), context.GroupId.ToString());
-            }
-        }
-
-        /// <inheritdoc />
-        public override void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
-        {
-            // Save state if first event.
-            if (!InitialStateSet)
-            {
-                InitialState = prevState;
-                InitialStateSet = true;
-            }
-
-            ResumePlaying = true;
-
-            // Make sure the client knows the playing item, to avoid duplicate requests.
-            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId()))
-            {
-                _logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.GetRequestType(), context.GroupId.ToString());
-                return;
-            }
-
-            var newItem = context.PreviousItemInQueue();
-            if (newItem)
-            {
-                // Send playing-queue update.
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousTrack);
-                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
-                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
-
-                // Reset status of sessions and await for all Ready events.
-                context.SetAllBuffering(true);
-            }
-            else
-            {
-                // Return to old state.
-                ISyncPlayState newState;
-                switch (prevState)
-                {
-                    case GroupState.Playing:
-                        newState = new PlayingGroupState(_logger);
-                        break;
-                    case GroupState.Paused:
-                        newState = new PausedGroupState(_logger);
-                        break;
-                    default:
-                        newState = new IdleGroupState(_logger);
-                        break;
-                }
-
-                context.SetState(newState);
-
-                _logger.LogDebug("HandleRequest: {0} in group {1}, no previous track available.", request.GetRequestType(), context.GroupId.ToString());
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index ab9be145f..178536631 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -39,14 +39,14 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <summary>
         /// The map between sessions and groups.
         /// </summary>
-        private readonly Dictionary<string, ISyncPlayGroupController> _sessionToGroupMap =
-            new Dictionary<string, ISyncPlayGroupController>(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, IGroupController> _sessionToGroupMap =
+            new Dictionary<string, IGroupController>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// The groups.
         /// </summary>
-        private readonly Dictionary<Guid, ISyncPlayGroupController> _groups =
-            new Dictionary<Guid, ISyncPlayGroupController>();
+        private readonly Dictionary<Guid, IGroupController> _groups =
+            new Dictionary<Guid, IGroupController>();
 
         /// <summary>
         /// Lock used for accesing any group.
@@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// Gets all groups.
         /// </summary>
         /// <value>All groups.</value>
-        public IEnumerable<ISyncPlayGroupController> Groups => _groups.Values;
+        public IEnumerable<IGroupController> Groups => _groups.Values;
 
         /// <inheritdoc />
         public void Dispose()
@@ -229,7 +229,7 @@ namespace Emby.Server.Implementations.SyncPlay
                     LeaveGroup(session, cancellationToken);
                 }
 
-                var group = new SyncPlayGroupController(_logger, _userManager, _sessionManager, _libraryManager, this);
+                var group = new GroupController(_logger, _userManager, _sessionManager, _libraryManager, this);
                 _groups[group.GroupId] = group;
 
                 group.CreateGroup(session, request, cancellationToken);
@@ -249,7 +249,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             lock (_groupsLock)
             {
-                _groups.TryGetValue(groupId, out ISyncPlayGroupController group);
+                _groups.TryGetValue(groupId, out IGroupController group);
 
                 if (group == null)
                 {
@@ -346,7 +346,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void HandleRequest(SessionInfo session, IPlaybackGroupRequest request, CancellationToken cancellationToken)
+        public void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken)
         {
             // TODO: create abstract class for GroupRequests to avoid explicit request type here.
             if (!IsRequestValid(session, GroupRequestType.Playback, request))
@@ -375,28 +375,23 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void AddSessionToGroup(SessionInfo session, ISyncPlayGroupController group)
+        public void AddSessionToGroup(SessionInfo session, IGroupController group)
         {
             if (session == null)
             {
                 throw new InvalidOperationException("Session is null!");
             }
 
-            if (group == null)
-            {
-                throw new InvalidOperationException("Group is null!");
-            }
-
             if (IsSessionInGroup(session))
             {
                 throw new InvalidOperationException("Session in other group already!");
             }
 
-            _sessionToGroupMap[session.Id] = group;
+            _sessionToGroupMap[session.Id] = group ?? throw new InvalidOperationException("Group is null!");
         }
 
         /// <inheritdoc />
-        public void RemoveSessionFromGroup(SessionInfo session, ISyncPlayGroupController group)
+        public void RemoveSessionFromGroup(SessionInfo session, IGroupController group)
         {
             if (session == null)
             {
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 847c3ab11..6bd78179b 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -125,10 +125,10 @@ namespace Jellyfin.Api.Controllers
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new PlayGroupRequest()
             {
-                PlayingQueue = RequestHelpers.GetGuids(playingQueue),
                 PlayingItemPosition = playingItemPosition,
                 StartPositionTicks = startPositionTicks
             };
+            syncPlayRequest.PlayingQueue.AddRange(RequestHelpers.GetGuids(playingQueue));
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -165,10 +165,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string[] playlistItemIds)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new RemoveFromPlaylistGroupRequest()
-            {
-                PlaylistItemIds = playlistItemIds
-            };
+            var syncPlayRequest = new RemoveFromPlaylistGroupRequest();
+            syncPlayRequest.PlaylistItemIds.AddRange(playlistItemIds);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -212,9 +210,9 @@ namespace Jellyfin.Api.Controllers
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new QueueGroupRequest()
             {
-                ItemIds = RequestHelpers.GetGuids(itemIds),
                 Mode = mode
             };
+            syncPlayRequest.ItemIds.AddRange(RequestHelpers.GetGuids(itemIds));
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -304,7 +302,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] bool bufferingDone)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            IPlaybackGroupRequest syncPlayRequest;
+            IGroupPlaybackRequest syncPlayRequest;
             if (!bufferingDone)
             {
                 syncPlayRequest = new BufferGroupRequest()
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
new file mode 100644
index 000000000..829ef2bba
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
@@ -0,0 +1,216 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class AbstractGroupState.
+    /// </summary>
+    /// <remarks>
+    /// Class is not thread-safe, external locking is required when accessing methods.
+    /// </remarks>
+    public abstract class AbstractGroupState : IGroupState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractGroupState"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+        protected AbstractGroupState(ILogger logger)
+        {
+            Logger = logger;
+        }
+
+        /// <inheritdoc />
+        public abstract GroupStateType Type { get; }
+
+        /// <summary>
+        /// Gets the logger.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <inheritdoc />
+        public abstract void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <inheritdoc />
+        public abstract void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, IGroupPlaybackRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, RemoveFromPlaylistGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            var playingItemRemoved = context.RemoveFromPlayQueue(request.PlaylistItemIds);
+
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.RemoveItems);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+            if (playingItemRemoved && !context.PlayQueue.IsItemPlaying())
+            {
+                Logger.LogDebug("HandleRequest: {0} in group {1}, play queue is empty.", request.Type, context.GroupId.ToString());
+
+                IGroupState idleState = new IdleGroupState(Logger);
+                context.SetState(idleState);
+                var stopRequest = new StopGroupRequest();
+                idleState.HandleRequest(context, Type, stopRequest, session, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, MovePlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            var result = context.MoveItemInPlayQueue(request.PlaylistItemId, request.NewIndex);
+
+            if (!result)
+            {
+                Logger.LogError("HandleRequest: {0} in group {1}, unable to move item in play queue.", request.Type, context.GroupId.ToString());
+                return;
+            }
+
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.MoveItem);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, QueueGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            var result = context.AddToPlayQueue(request.ItemIds, request.Mode);
+
+            if (!result)
+            {
+                Logger.LogError("HandleRequest: {0} in group {1}, unable to add items to play queue.", request.Type, context.GroupId.ToString());
+                return;
+            }
+
+            var reason = request.Mode.Equals("next", StringComparison.OrdinalIgnoreCase) ? PlayQueueUpdateReason.QueueNext : PlayQueueUpdateReason.Queue;
+            var playQueueUpdate = context.GetPlayQueueUpdate(reason);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            UnhandledRequest(request);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetRepeatModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            context.SetRepeatMode(request.Mode);
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.RepeatMode);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetShuffleModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            context.SetShuffleMode(request.Mode);
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.ShuffleMode);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PingGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Collected pings are used to account for network latency when unpausing playback.
+            context.UpdatePing(session, request.Ping);
+        }
+
+        /// <inheritdoc />
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, IgnoreWaitGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            context.SetIgnoreGroupWait(session, request.IgnoreWait);
+        }
+
+        /// <summary>
+        /// Sends a group state update to all group.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="reason">The reason of the state change.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        protected void SendGroupStateUpdate(IGroupStateContext context, IGroupPlaybackRequest reason, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Notify relevant state change event.
+            var stateUpdate = new GroupStateUpdate()
+            {
+                State = Type,
+                Reason = reason.Type
+            };
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.StateUpdate, stateUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+        }
+
+        private void UnhandledRequest(IGroupPlaybackRequest request)
+        {
+            Logger.LogWarning("HandleRequest: unhandled {0} request for {1} state.", request.Type, Type);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
new file mode 100644
index 000000000..1a507e044
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
@@ -0,0 +1,126 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class IdleGroupState.
+    /// </summary>
+    /// <remarks>
+    /// Class is not thread-safe, external locking is required when accessing methods.
+    /// </remarks>
+    public class IdleGroupState : AbstractGroupState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IdleGroupState"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+        public IdleGroupState(ILogger logger)
+            : base(logger)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override GroupStateType Type
+        {
+            get
+            {
+                return GroupStateType.Idle;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, Type, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, prevState, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, prevState, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, prevState, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, prevState, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            SendStopCommand(context, prevState, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        private void SendStopCommand(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            var command = context.NewSyncPlayCommand(SendCommandType.Stop);
+            if (!prevState.Equals(Type))
+            {
+                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+            }
+            else
+            {
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
new file mode 100644
index 000000000..11f526d31
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PausedGroupState.
+    /// </summary>
+    /// <remarks>
+    /// Class is not thread-safe, external locking is required when accessing methods.
+    /// </remarks>
+    public class PausedGroupState : AbstractGroupState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PausedGroupState"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+        public PausedGroupState(ILogger logger)
+            : base(logger)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override GroupStateType Type
+        {
+            get
+            {
+                return GroupStateType.Paused;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Wait for session to be ready.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.SessionJoined(context, Type, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var playingState = new PlayingGroupState(Logger);
+            context.SetState(playingState);
+            playingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            if (!prevState.Equals(Type))
+            {
+                // Pause group and compute the media playback position.
+                var currentTime = DateTime.UtcNow;
+                var elapsedTime = currentTime - context.LastActivity;
+                context.LastActivity = currentTime;
+                // Elapsed time is negative if event happens
+                // during the delay added to account for latency.
+                // In this phase clients haven't started the playback yet.
+                // In other words, LastActivity is in the future,
+                // when playback unpause is supposed to happen.
+                // Seek only if playback actually started.
+                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
+
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+
+                // Notify relevant state change event.
+                SendGroupStateUpdate(context, request, session, cancellationToken);
+            }
+            else
+            {
+                // Client got lost, sending current state.
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var idleState = new IdleGroupState(Logger);
+            context.SetState(idleState);
+            idleState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            if (prevState.Equals(Type))
+            {
+                // Client got lost, sending current state.
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+            else if (prevState.Equals(GroupStateType.Waiting))
+            {
+                // Sending current state to all clients.
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+
+                // Notify relevant state change event.
+                SendGroupStateUpdate(context, request, session, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
new file mode 100644
index 000000000..2aa759811
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PlayingGroupState.
+    /// </summary>
+    /// <remarks>
+    /// Class is not thread-safe, external locking is required when accessing methods.
+    /// </remarks>
+    public class PlayingGroupState : AbstractGroupState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayingGroupState"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+        public PlayingGroupState(ILogger logger)
+            : base(logger)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override GroupStateType Type
+        {
+            get
+            {
+                return GroupStateType.Playing;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether requests for buffering should be ignored.
+        /// </summary>
+        public bool IgnoreBuffering { get; set; }
+
+        /// <inheritdoc />
+        public override void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Wait for session to be ready.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.SessionJoined(context, Type, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            if (!prevState.Equals(Type))
+            {
+                // Pick a suitable time that accounts for latency.
+                var delayMillis = Math.Max(context.GetHighestPing() * 2, context.DefaultPing);
+
+                // Unpause group and set starting point in future.
+                // Clients will start playback at LastActivity (datetime) from PositionTicks (playback position).
+                // The added delay does not guarantee, of course, that the command will be received in time.
+                // Playback synchronization will mainly happen client side.
+                context.LastActivity = DateTime.UtcNow.AddMilliseconds(delayMillis);
+
+                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
+                context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+
+                // Notify relevant state change event.
+                SendGroupStateUpdate(context, request, session, cancellationToken);
+            }
+            else
+            {
+                // Client got lost, sending current state.
+                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var pausedState = new PausedGroupState(Logger);
+            context.SetState(pausedState);
+            pausedState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var idleState = new IdleGroupState(Logger);
+            context.SetState(idleState);
+            idleState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            if (IgnoreBuffering)
+            {
+                return;
+            }
+
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            if (prevState.Equals(Type))
+            {
+                // Group was not waiting, make sure client has latest state.
+                var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+            else if (prevState.Equals(GroupStateType.Waiting))
+            {
+                // Notify relevant state change event.
+                SendGroupStateUpdate(context, request, session, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Change state.
+            var waitingState = new WaitingGroupState(Logger);
+            context.SetState(waitingState);
+            waitingState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
new file mode 100644
index 000000000..7f454570a
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
@@ -0,0 +1,655 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class WaitingGroupState.
+    /// </summary>
+    /// <remarks>
+    /// Class is not thread-safe, external locking is required when accessing methods.
+    /// </remarks>
+    public class WaitingGroupState : AbstractGroupState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WaitingGroupState"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+        public WaitingGroupState(ILogger logger)
+            : base(logger)
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public override GroupStateType Type
+        {
+            get
+            {
+                return GroupStateType.Waiting;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether playback should resume when group is ready.
+        /// </summary>
+        public bool ResumePlaying { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the initial state has been set.
+        /// </summary>
+        private bool InitialStateSet { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets the group state before the first ever event.
+        /// </summary>
+        private GroupStateType InitialState { get; set; }
+
+        /// <inheritdoc />
+        public override void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            if (prevState.Equals(GroupStateType.Playing))
+            {
+                ResumePlaying = true;
+                // Pause group and compute the media playback position.
+                var currentTime = DateTime.UtcNow;
+                var elapsedTime = currentTime - context.LastActivity;
+                context.LastActivity = currentTime;
+                // Elapsed time is negative if event happens
+                // during the delay added to account for latency.
+                // In this phase clients haven't started the playback yet.
+                // In other words, LastActivity is in the future,
+                // when playback unpause is supposed to happen.
+                // Seek only if playback actually started.
+                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
+            }
+
+            // Prepare new session.
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, update, cancellationToken);
+
+            context.SetBuffering(session, true);
+
+            // Send pause command to all non-buffering sessions.
+            var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+            context.SendCommand(session, SyncPlayBroadcastType.AllReady, command, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            context.SetBuffering(session, false);
+
+            if (!context.IsBuffering())
+            {
+                if (ResumePlaying)
+                {
+                    // Client, that was buffering, left the group.
+                    var playingState = new PlayingGroupState(Logger);
+                    context.SetState(playingState);
+                    var unpauseRequest = new UnpauseGroupRequest();
+                    playingState.HandleRequest(context, Type, unpauseRequest, session, cancellationToken);
+
+                    Logger.LogDebug("SessionLeaving: {0} left the group {1}, notifying others to resume.", session.Id, context.GroupId.ToString());
+                }
+                else
+                {
+                    // Group is ready, returning to previous state.
+                    var pausedState = new PausedGroupState(Logger);
+                    context.SetState(pausedState);
+
+                    Logger.LogDebug("SessionLeaving: {0} left the group {1}, returning to previous state.", session.Id, context.GroupId.ToString());
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            ResumePlaying = true;
+
+            var setQueueStatus = context.SetPlayQueue(request.PlayingQueue, request.PlayingItemPosition, request.StartPositionTicks);
+            if (!setQueueStatus)
+            {
+                Logger.LogError("HandleRequest: {0} in group {1}, unable to set playing queue.", request.Type, context.GroupId.ToString());
+
+                // Ignore request and return to previous state.
+                IGroupState newState = prevState switch {
+                    GroupStateType.Playing => new PlayingGroupState(Logger),
+                    GroupStateType.Paused => new PausedGroupState(Logger),
+                    _ => new IdleGroupState(Logger)
+                };
+
+                context.SetState(newState);
+                return;
+            }
+
+            var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
+            var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+            context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+            // Reset status of sessions and await for all Ready events.
+            context.SetAllBuffering(true);
+
+            Logger.LogDebug("HandleRequest: {0} in group {1}, {2} set a new play queue.", request.Type, context.GroupId.ToString(), session.Id);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            ResumePlaying = true;
+
+            var result = context.SetPlayingItem(request.PlaylistItemId);
+            if (result)
+            {
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
+                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+                // Reset status of sessions and await for all Ready events.
+                context.SetAllBuffering(true);
+            }
+            else
+            {
+                // Return to old state.
+                IGroupState newState = prevState switch
+                {
+                    GroupStateType.Playing => new PlayingGroupState(Logger),
+                    GroupStateType.Paused => new PausedGroupState(Logger),
+                    _ => new IdleGroupState(Logger)
+                };
+
+                context.SetState(newState);
+
+                Logger.LogDebug("HandleRequest: {0} in group {1}, unable to change current playing item.", request.Type, context.GroupId.ToString());
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            if (prevState.Equals(GroupStateType.Idle))
+            {
+                ResumePlaying = true;
+                context.RestartCurrentItem();
+
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NewPlaylist);
+                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+                // Reset status of sessions and await for all Ready events.
+                context.SetAllBuffering(true);
+
+                Logger.LogDebug("HandleRequest: {0} in group {1}, waiting for all ready events.", request.Type, context.GroupId.ToString());
+            }
+            else
+            {
+                if (ResumePlaying)
+                {
+                    Logger.LogDebug("HandleRequest: {0} in group {1}, ignoring sessions that are not ready and forcing the playback to start.", request.Type, context.GroupId.ToString());
+
+                    // An Unpause request is forcing the playback to start, ignoring sessions that are not ready.
+                    context.SetAllBuffering(false);
+
+                    // Change state.
+                    var playingState = new PlayingGroupState(Logger)
+                    {
+                        IgnoreBuffering = true
+                    };
+                    context.SetState(playingState);
+                    playingState.HandleRequest(context, Type, request, session, cancellationToken);
+                }
+                else
+                {
+                    // Group would have gone to paused state, now will go to playing state when ready.
+                    ResumePlaying = true;
+
+                    // Notify relevant state change event.
+                    SendGroupStateUpdate(context, request, session, cancellationToken);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            // Wait for sessions to be ready, then switch to paused state.
+            ResumePlaying = false;
+
+            // Notify relevant state change event.
+            SendGroupStateUpdate(context, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            // Change state.
+            var idleState = new IdleGroupState(Logger);
+            context.SetState(idleState);
+            idleState.HandleRequest(context, Type, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            if (prevState.Equals(GroupStateType.Playing))
+            {
+                ResumePlaying = true;
+            }
+            else if (prevState.Equals(GroupStateType.Paused))
+            {
+                ResumePlaying = false;
+            }
+
+            // Sanitize PositionTicks.
+            var ticks = context.SanitizePositionTicks(request.PositionTicks);
+
+            // Seek.
+            context.PositionTicks = ticks;
+            context.LastActivity = DateTime.UtcNow;
+
+            var command = context.NewSyncPlayCommand(SendCommandType.Seek);
+            context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+
+            // Reset status of sessions and await for all Ready events.
+            context.SetAllBuffering(true);
+
+            // Notify relevant state change event.
+            SendGroupStateUpdate(context, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            // Make sure the client is playing the correct item.
+            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
+
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
+                var updateSession = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
+                context.SetBuffering(session, true);
+
+                return;
+            }
+
+            if (prevState.Equals(GroupStateType.Playing))
+            {
+                // Resume playback when all ready.
+                ResumePlaying = true;
+
+                context.SetBuffering(session, true);
+
+                // Pause group and compute the media playback position.
+                var currentTime = DateTime.UtcNow;
+                var elapsedTime = currentTime - context.LastActivity;
+                context.LastActivity = currentTime;
+                // Elapsed time is negative if event happens
+                // during the delay added to account for latency.
+                // In this phase clients haven't started the playback yet.
+                // In other words, LastActivity is in the future,
+                // when playback unpause is supposed to happen.
+                // Seek only if playback actually started.
+                context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
+
+                // Send pause command to all non-buffering sessions.
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.AllReady, command, cancellationToken);
+            }
+            else if (prevState.Equals(GroupStateType.Paused))
+            {
+                // Don't resume playback when all ready.
+                ResumePlaying = false;
+
+                context.SetBuffering(session, true);
+
+                // Send pause command to buffering session.
+                var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+            }
+            else if (prevState.Equals(GroupStateType.Waiting))
+            {
+                // Another session is now buffering.
+                context.SetBuffering(session, true);
+
+                if (!ResumePlaying)
+                {
+                    // Force update for this session that should be paused.
+                    var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+                }
+            }
+
+            // Notify relevant state change event.
+            SendGroupStateUpdate(context, request, session, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            // Make sure the client is playing the correct item.
+            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
+
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
+                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, update, cancellationToken);
+                context.SetBuffering(session, true);
+
+                return;
+            }
+
+            // Compute elapsed time between the client reported time and now.
+            // Elapsed time is used to estimate the client position when playback is unpaused.
+            // Ideally, the request is received and handled without major delays.
+            // However, to avoid waiting indefinitely when a client is not reporting a correct time,
+            // the elapsed time is ignored after a certain threshold.
+            var currentTime = DateTime.UtcNow;
+            var elapsedTime = currentTime.Subtract(request.When);
+            var timeSyncThresholdTicks = TimeSpan.FromMilliseconds(context.TimeSyncOffset).Ticks;
+            if (Math.Abs(elapsedTime.Ticks) > timeSyncThresholdTicks)
+            {
+                Logger.LogWarning("HandleRequest: {0} in group {1}, {2} is not time syncing properly. Ignoring elapsed time.", request.Type, context.GroupId.ToString(), session.Id);
+
+                elapsedTime = TimeSpan.Zero;
+            }
+
+            // Ignore elapsed time if client is paused.
+            if (!request.IsPlaying)
+            {
+                elapsedTime = TimeSpan.Zero;
+            }
+
+            var requestTicks = context.SanitizePositionTicks(request.PositionTicks);
+            var clientPosition = TimeSpan.FromTicks(requestTicks) + elapsedTime;
+            var delayTicks = context.PositionTicks - clientPosition.Ticks;
+            var maxPlaybackOffsetTicks = TimeSpan.FromMilliseconds(context.MaxPlaybackOffset).Ticks;
+
+            Logger.LogDebug("HandleRequest: {0} in group {1}, {2} at {3} (delay of {4} seconds).", request.Type, context.GroupId.ToString(), session.Id, clientPosition, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+
+            if (ResumePlaying)
+            {
+                // Handle case where session reported as ready but in reality
+                // it has no clue of the real position nor the playback state.
+                if (!request.IsPlaying && Math.Abs(delayTicks) > maxPlaybackOffsetTicks)
+                {
+                    // Session not ready at all.
+                    context.SetBuffering(session, true);
+
+                    // Correcting session's position.
+                    var command = context.NewSyncPlayCommand(SendCommandType.Seek);
+                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+
+                    // Notify relevant state change event.
+                    SendGroupStateUpdate(context, request, session, cancellationToken);
+
+                    Logger.LogWarning("HandleRequest: {0} in group {1}, {2} got lost in time, correcting.", request.Type, context.GroupId.ToString(), session.Id);
+                    return;
+                }
+
+                // Session is ready.
+                context.SetBuffering(session, false);
+
+                if (context.IsBuffering())
+                {
+                    // Others are still buffering, tell this client to pause when ready.
+                    var command = context.NewSyncPlayCommand(SendCommandType.Pause);
+                    var pauseAtTime = currentTime.AddTicks(delayTicks);
+                    command.When = context.DateToUTCString(pauseAtTime);
+                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+
+                    Logger.LogInformation("HandleRequest: {0} in group {1}, others still buffering, {2} will pause when ready in {3} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                }
+                else
+                {
+                    // If all ready, then start playback.
+                    // Let other clients resume as soon as the buffering client catches up.
+                    if (delayTicks > context.GetHighestPing() * 2 * TimeSpan.TicksPerMillisecond)
+                    {
+                        // Client that was buffering is recovering, notifying others to resume.
+                        context.LastActivity = currentTime.AddTicks(delayTicks);
+                        var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
+                        var filter = SyncPlayBroadcastType.AllExceptCurrentSession;
+                        if (!request.IsPlaying)
+                        {
+                            filter = SyncPlayBroadcastType.AllGroup;
+                        }
+
+                        context.SendCommand(session, filter, command, cancellationToken);
+
+                        Logger.LogInformation("HandleRequest: {0} in group {1}, {2} is recovering, notifying others to resume in {3} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                    }
+                    else
+                    {
+                        // Client, that was buffering, resumed playback but did not update others in time.
+                        delayTicks = context.GetHighestPing() * 2 * TimeSpan.TicksPerMillisecond;
+                        delayTicks = Math.Max(delayTicks, context.DefaultPing);
+
+                        context.LastActivity = currentTime.AddTicks(delayTicks);
+
+                        var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
+                        context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
+
+                        Logger.LogWarning("HandleRequest: {0} in group {1}, {2} resumed playback but did not update others in time. {3} seconds to recover.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                    }
+
+                    // Change state.
+                    var playingState = new PlayingGroupState(Logger);
+                    context.SetState(playingState);
+                    playingState.HandleRequest(context, Type, request, session, cancellationToken);
+                }
+            }
+            else
+            {
+                // Check that session is really ready, tollerate player imperfections under a certain threshold.
+                if (Math.Abs(context.PositionTicks - requestTicks) > maxPlaybackOffsetTicks)
+                {
+                    // Session still not ready.
+                    context.SetBuffering(session, true);
+                    // Session is seeking to wrong position, correcting.
+                    var command = context.NewSyncPlayCommand(SendCommandType.Seek);
+                    context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
+
+                    // Notify relevant state change event.
+                    SendGroupStateUpdate(context, request, session, cancellationToken);
+
+                    Logger.LogWarning("HandleRequest: {0} in group {1}, {2} was seeking to wrong position, correcting.", request.Type, context.GroupId.ToString(), session.Id);
+                    return;
+                }
+                else
+                {
+                    // Session is ready.
+                    context.SetBuffering(session, false);
+                }
+
+                if (!context.IsBuffering())
+                {
+                    // Group is ready, returning to previous state.
+                    var pausedState = new PausedGroupState(Logger);
+                    context.SetState(pausedState);
+
+                    if (InitialState.Equals(GroupStateType.Playing))
+                    {
+                        // Group went from playing to waiting state and a pause request occured while waiting.
+                        var pauserequest = new PauseGroupRequest();
+                        pausedState.HandleRequest(context, Type, pauserequest, session, cancellationToken);
+                    }
+                    else if (InitialState.Equals(GroupStateType.Paused))
+                    {
+                        pausedState.HandleRequest(context, Type, request, session, cancellationToken);
+                    }
+
+                    Logger.LogDebug("HandleRequest: {0} in group {1}, {2} is ready, returning to previous state.", request.Type, context.GroupId.ToString(), session.Id);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            ResumePlaying = true;
+
+            // Make sure the client knows the playing item, to avoid duplicate requests.
+            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.Type, context.GroupId.ToString());
+                return;
+            }
+
+            var newItem = context.NextItemInQueue();
+            if (newItem)
+            {
+                // Send playing-queue update.
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextTrack);
+                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+                // Reset status of sessions and await for all Ready events.
+                context.SetAllBuffering(true);
+            }
+            else
+            {
+                // Return to old state.
+                IGroupState newState = prevState switch
+                {
+                    GroupStateType.Playing => new PlayingGroupState(Logger),
+                    GroupStateType.Paused => new PausedGroupState(Logger),
+                    _ => new IdleGroupState(Logger)
+                };
+
+                context.SetState(newState);
+
+                Logger.LogDebug("HandleRequest: {0} in group {1}, no next track available.", request.Type, context.GroupId.ToString());
+            }
+        }
+
+        /// <inheritdoc />
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        {
+            // Save state if first event.
+            if (!InitialStateSet)
+            {
+                InitialState = prevState;
+                InitialStateSet = true;
+            }
+
+            ResumePlaying = true;
+
+            // Make sure the client knows the playing item, to avoid duplicate requests.
+            if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.Type, context.GroupId.ToString());
+                return;
+            }
+
+            var newItem = context.PreviousItemInQueue();
+            if (newItem)
+            {
+                // Send playing-queue update.
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousTrack);
+                var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
+                context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
+
+                // Reset status of sessions and await for all Ready events.
+                context.SetAllBuffering(true);
+            }
+            else
+            {
+                // Return to old state.
+                IGroupState newState = prevState switch
+                {
+                    GroupStateType.Playing => new PlayingGroupState(Logger),
+                    GroupStateType.Paused => new PausedGroupState(Logger),
+                    _ => new IdleGroupState(Logger)
+                };
+
+                context.SetState(newState);
+
+                Logger.LogDebug("HandleRequest: {0} in group {1}, no previous track available.", request.Type, context.GroupId.ToString());
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupController.cs b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
new file mode 100644
index 000000000..038233fdd
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Threading;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Interface IGroupController.
+    /// </summary>
+    public interface IGroupController
+    {
+        /// <summary>
+        /// Gets the group identifier.
+        /// </summary>
+        /// <value>The group identifier.</value>
+        Guid GroupId { get; }
+
+        /// <summary>
+        /// Gets the play queue.
+        /// </summary>
+        /// <value>The play queue.</value>
+        PlayQueueManager PlayQueue { get; }
+
+        /// <summary>
+        /// Checks if the group is empty.
+        /// </summary>
+        /// <returns><c>true</c> if the group is empty, <c>false</c> otherwise.</returns>
+        bool IsGroupEmpty();
+
+        /// <summary>
+        /// Initializes the group with the session's info.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Adds the session to the group.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Restores the state of a session that already joined the group.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Removes the session from the group.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void SessionLeave(SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles the requested action by the session.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="request">The requested action.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the info about the group for the clients.
+        /// </summary>
+        /// <returns>The group info for the clients.</returns>
+        GroupInfoDto GetInfo();
+
+        /// <summary>
+        /// Checks if a user has access to all content in the play queue.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <returns><c>true</c> if the user can access the play queue; <c>false</c> otherwise.</returns>
+        bool HasAccessToPlayQueue(User user);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs b/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
new file mode 100644
index 000000000..3b195e98c
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Interface IGroupPlaybackRequest.
+    /// </summary>
+    public interface IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets the playback request type.
+        /// </summary>
+        /// <returns>The playback request type.</returns>
+        PlaybackRequestType Type { get; }
+
+        /// <summary>
+        /// Applies the request to a group.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="state">The current state.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupState.cs b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
new file mode 100644
index 000000000..981b65221
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
@@ -0,0 +1,216 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Interface IGroupState.
+    /// </summary>
+    public interface IGroupState
+    {
+        /// <summary>
+        /// Gets the group state type.
+        /// </summary>
+        /// <value>The group state type.</value>
+        GroupStateType Type { get; }
+
+        /// <summary>
+        /// Handles a session that joined the group.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void SessionJoined(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a session that is leaving the group.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void SessionLeaving(IGroupStateContext context, GroupStateType prevState, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Generic handle. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The generic action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, IGroupPlaybackRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a play action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The play action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a playlist-item change requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The playlist-item change action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a remove-items change requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The remove-items change action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, RemoveFromPlaylistGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a move-item change requested by a session. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The move-item change action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, MovePlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a queue change requested by a session. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The queue action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, QueueGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles an unpause action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The unpause action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a pause action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The pause action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a stop action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The stop action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a seek action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The seek action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a buffering action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The buffering action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a buffering-done action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The buffering-done action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a next-track action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The next-track action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a previous-track action requested by a session. Context's state can change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The previous-track action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a repeat-mode change requested by a session. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The repeat-mode action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetRepeatModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Handles a shuffle-mode change requested by a session. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The shuffle-mode action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, SetShuffleModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Updates ping of a session. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The buffering-done action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PingGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Updates whether the session should be considered during group wait. Context's state should not change.
+        /// </summary>
+        /// <param name="context">The context of the state.</param>
+        /// <param name="prevState">The previous state.</param>
+        /// <param name="request">The ignore-wait action.</param>
+        /// <param name="session">The session.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, IgnoreWaitGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
new file mode 100644
index 000000000..2ddaae640
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
@@ -0,0 +1,228 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Interface IGroupStateContext.
+    /// </summary>
+    public interface IGroupStateContext
+    {
+        /// <summary>
+        /// Gets the default ping value used for sessions, in milliseconds.
+        /// </summary>
+        /// <value>The default ping value used for sessions, in milliseconds.</value>
+        long DefaultPing { get; }
+
+        /// <summary>
+        /// Gets the maximum time offset error accepted for dates reported by clients, in milliseconds.
+        /// </summary>
+        /// <value>The maximum offset error accepted, in milliseconds.</value>
+        long TimeSyncOffset { get; }
+
+        /// <summary>
+        /// Gets the maximum offset error accepted for position reported by clients, in milliseconds.
+        /// </summary>
+        /// <value>The maximum offset error accepted, in milliseconds.</value>
+        long MaxPlaybackOffset { get; }
+
+        /// <summary>
+        /// Gets the group identifier.
+        /// </summary>
+        /// <value>The group identifier.</value>
+        Guid GroupId { get; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the last activity.
+        /// </summary>
+        /// <value>The last activity.</value>
+        DateTime LastActivity { get; set; }
+
+        /// <summary>
+        /// Gets the play queue.
+        /// </summary>
+        /// <value>The play queue.</value>
+        PlayQueueManager PlayQueue { get; }
+
+        /// <summary>
+        /// Sets a new state.
+        /// </summary>
+        /// <param name="state">The new state.</param>
+        void SetState(IGroupState state);
+
+        /// <summary>
+        /// Sends a GroupUpdate message to the interested sessions.
+        /// </summary>
+        /// <typeparam name="T">The type of the data of the message.</typeparam>
+        /// <param name="from">The current session.</param>
+        /// <param name="type">The filtering type.</param>
+        /// <param name="message">The message to send.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The task.</returns>
+        Task SendGroupUpdate<T>(SessionInfo from, SyncPlayBroadcastType type, GroupUpdate<T> message, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Sends a playback command to the interested sessions.
+        /// </summary>
+        /// <param name="from">The current session.</param>
+        /// <param name="type">The filtering type.</param>
+        /// <param name="message">The message to send.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The task.</returns>
+        Task SendCommand(SessionInfo from, SyncPlayBroadcastType type, SendCommand message, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Builds a new playback command with some default values.
+        /// </summary>
+        /// <param name="type">The command type.</param>
+        /// <returns>The command.</returns>
+        SendCommand NewSyncPlayCommand(SendCommandType type);
+
+        /// <summary>
+        /// Builds a new group update message.
+        /// </summary>
+        /// <typeparam name="T">The type of the data of the message.</typeparam>
+        /// <param name="type">The update type.</param>
+        /// <param name="data">The data to send.</param>
+        /// <returns>The group update.</returns>
+        GroupUpdate<T> NewSyncPlayGroupUpdate<T>(GroupUpdateType type, T data);
+
+        /// <summary>
+        /// Converts DateTime to UTC string.
+        /// </summary>
+        /// <param name="dateTime">The date to convert.</param>
+        /// <returns>The UTC string.</returns>
+        string DateToUTCString(DateTime dateTime);
+
+        /// <summary>
+        /// Sanitizes the PositionTicks, considers the current playing item when available.
+        /// </summary>
+        /// <param name="positionTicks">The PositionTicks.</param>
+        /// <returns>The sanitized position ticks.</returns>
+        long SanitizePositionTicks(long? positionTicks);
+
+        /// <summary>
+        /// Updates the ping of a session, in milliseconds.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="ping">The ping, in milliseconds.</param>
+        void UpdatePing(SessionInfo session, long ping);
+
+        /// <summary>
+        /// Gets the highest ping in the group, in milliseconds.
+        /// </summary>
+        /// <returns>The highest ping in the group.</returns>
+        long GetHighestPing();
+
+        /// <summary>
+        /// Sets the session's buffering state.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="isBuffering">The state.</param>
+        void SetBuffering(SessionInfo session, bool isBuffering);
+
+        /// <summary>
+        /// Sets the buffering state of all the sessions.
+        /// </summary>
+        /// <param name="isBuffering">The state.</param>
+        void SetAllBuffering(bool isBuffering);
+
+        /// <summary>
+        /// Gets the group buffering state.
+        /// </summary>
+        /// <returns><c>true</c> if there is a session buffering in the group; <c>false</c> otherwise.</returns>
+        bool IsBuffering();
+
+        /// <summary>
+        /// Sets the session's group wait state.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="ignoreGroupWait">The state.</param>
+        void SetIgnoreGroupWait(SessionInfo session, bool ignoreGroupWait);
+
+        /// <summary>
+        /// Sets a new play queue.
+        /// </summary>
+        /// <param name="playQueue">The new play queue.</param>
+        /// <param name="playingItemPosition">The playing item position in the play queue.</param>
+        /// <param name="startPositionTicks">The start position ticks.</param>
+        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
+        bool SetPlayQueue(IEnumerable<Guid> playQueue, int playingItemPosition, long startPositionTicks);
+
+        /// <summary>
+        /// Sets the playing item.
+        /// </summary>
+        /// <param name="playlistItemId">The new playing item identifier.</param>
+        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
+        bool SetPlayingItem(string playlistItemId);
+
+        /// <summary>
+        /// Removes items from the play queue.
+        /// </summary>
+        /// <param name="playlistItemIds">The items to remove.</param>
+        /// <returns><c>true</c> if playing item got removed; <c>false</c> otherwise.</returns>
+        bool RemoveFromPlayQueue(IEnumerable<string> playlistItemIds);
+
+        /// <summary>
+        /// Moves an item in the play queue.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist identifier of the item to move.</param>
+        /// <param name="newIndex">The new position.</param>
+        /// <returns><c>true</c> if item has been moved; <c>false</c> if something went wrong.</returns>
+        bool MoveItemInPlayQueue(string playlistItemId, int newIndex);
+
+        /// <summary>
+        /// Updates the play queue.
+        /// </summary>
+        /// <param name="newItems">The new items to add to the play queue.</param>
+        /// <param name="mode">The mode with which the items will be added.</param>
+        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
+        bool AddToPlayQueue(IEnumerable<Guid> newItems, string mode);
+
+        /// <summary>
+        /// Restarts current item in play queue.
+        /// </summary>
+        void RestartCurrentItem();
+
+        /// <summary>
+        /// Picks next item in play queue.
+        /// </summary>
+        /// <returns><c>true</c> if the item changed; <c>false</c> otherwise.</returns>
+        bool NextItemInQueue();
+
+        /// <summary>
+        /// Picks previous item in play queue.
+        /// </summary>
+        /// <returns><c>true</c> if the item changed; <c>false</c> otherwise.</returns>
+        bool PreviousItemInQueue();
+
+        /// <summary>
+        /// Sets the repeat mode.
+        /// </summary>
+        /// <param name="mode">The new mode.</param>
+        void SetRepeatMode(string mode);
+
+        /// <summary>
+        /// Sets the shuffle mode.
+        /// </summary>
+        /// <param name="mode">The new mode.</param>
+        void SetShuffleMode(string mode);
+
+        /// <summary>
+        /// Creates a play queue update.
+        /// </summary>
+        /// <param name="reason">The reason for the update.</param>
+        /// <returns>The play queue update.</returns>
+        PlayQueueUpdate GetPlayQueueUpdate(PlayQueueUpdateReason reason);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/IPlaybackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/IPlaybackGroupRequest.cs
deleted file mode 100644
index 35ca64c8d..000000000
--- a/MediaBrowser.Controller/SyncPlay/IPlaybackGroupRequest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Interface IPlaybackGroupRequest.
-    /// </summary>
-    public interface IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets the playback request type.
-        /// </summary>
-        /// <returns>The playback request type.</returns>
-        PlaybackRequestType GetRequestType();
-
-        /// <summary>
-        /// Applies the request to a group.
-        /// </summary>
-        void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken);
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayController.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayController.cs
deleted file mode 100644
index 2f497ebbb..000000000
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayController.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Threading;
-using Jellyfin.Data.Entities;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Interface ISyncPlayGroupController.
-    /// </summary>
-    public interface ISyncPlayGroupController
-    {
-        /// <summary>
-        /// Gets the group identifier.
-        /// </summary>
-        /// <value>The group identifier.</value>
-        Guid GroupId { get; }
-
-        /// <summary>
-        /// Gets the play queue.
-        /// </summary>
-        /// <value>The play queue.</value>
-        PlayQueueManager PlayQueue { get; }
-
-        /// <summary>
-        /// Checks if the group is empty.
-        /// </summary>
-        /// <returns><c>true</c> if the group is empty, <c>false</c> otherwise</returns>
-        bool IsGroupEmpty();
-
-        /// <summary>
-        /// Initializes the group with the session's info.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="request">The request.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Adds the session to the group.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="request">The request.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Restores the state of a session that already joined the group.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="request">The request.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Removes the session from the group.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionLeave(SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles the requested action by the session.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="request">The requested action.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(SessionInfo session, IPlaybackGroupRequest request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the info about the group for the clients.
-        /// </summary>
-        /// <returns>The group info for the clients.</returns>
-        GroupInfoDto GetInfo();
-
-        /// <summary>
-        /// Checks if a user has access to all content in the play queue.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns><c>true</c> if the user can access the play queue; <c>false</c> otherwise.</returns>
-        bool HasAccessToPlayQueue(User user);
-
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index ec13686c6..65146d4ae 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(SessionInfo session, IPlaybackGroupRequest request, CancellationToken cancellationToken);
+        void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Maps a session to a group.
@@ -56,7 +56,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="group">The group.</param>
         /// <exception cref="InvalidOperationException">Thrown when the user is in another group already.</exception>
-        void AddSessionToGroup(SessionInfo session, ISyncPlayGroupController group);
+        void AddSessionToGroup(SessionInfo session, IGroupController group);
 
         /// <summary>
         /// Unmaps a session from a group.
@@ -64,6 +64,6 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="group">The group.</param>
         /// <exception cref="InvalidOperationException">Thrown when the user is not found in the specified group.</exception>
-        void RemoveSessionFromGroup(SessionInfo session, ISyncPlayGroupController group);
+        void RemoveSessionFromGroup(SessionInfo session, IGroupController group);
     }
 }
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayState.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayState.cs
deleted file mode 100644
index 218e871e3..000000000
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayState.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Interface ISyncPlayState.
-    /// </summary>
-    public interface ISyncPlayState
-    {
-        /// <summary>
-        /// Gets the group state.
-        /// </summary>
-        /// <value>The group state.</value>
-        GroupState GetGroupState();
-
-        /// <summary>
-        /// Handles a session that joined the group.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionJoined(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a session that is leaving the group.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionLeaving(ISyncPlayStateContext context, GroupState prevState, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Generic handle. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The generic action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, IPlaybackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a play action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The play action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PlayGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a playlist-item change requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The playlist-item change action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetPlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a remove-items change requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The remove-items change action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, RemoveFromPlaylistGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a move-item change requested by a session. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The move-item change action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, MovePlaylistItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a queue change requested by a session. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The queue action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, QueueGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles an unpause action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The unpause action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, UnpauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a pause action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The pause action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PauseGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a stop action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The stop action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, StopGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a seek action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The seek action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SeekGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a buffering action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The buffering action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, BufferGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a buffering-done action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The buffering-done action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a next-track action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The next-track action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a previous-track action requested by a session. Context's state can change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The previous-track action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a repeat-mode change requested by a session. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The repeat-mode action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetRepeatModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles a shuffle-mode change requested by a session. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The shuffle-mode action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, SetShuffleModeGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Updates ping of a session. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The buffering-done action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, PingGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Updates whether the session should be considered during group wait. Context's state should not change.
-        /// </summary>
-        /// <param name="context">The context of the state.</param>
-        /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The ignore-wait action.</param>
-        /// <param name="session">The session.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(ISyncPlayStateContext context, GroupState prevState, IgnoreWaitGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayStateContext.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayStateContext.cs
deleted file mode 100644
index 4aac2a881..000000000
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayStateContext.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Interface ISyncPlayStateContext.
-    /// </summary>
-    public interface ISyncPlayStateContext
-    {
-        /// <summary>
-        /// Gets the default ping value used for sessions, in milliseconds.
-        /// </summary>
-        /// <value>The default ping value used for sessions, in milliseconds.</value>
-        long DefaultPing { get; }
-
-        /// <summary>
-        /// Gets the maximum time offset error accepted for dates reported by clients, in milliseconds.
-        /// </summary>
-        /// <value>The maximum offset error accepted, in milliseconds.</value>
-        long TimeSyncOffset { get; }
-
-        /// <summary>
-        /// Gets the maximum offset error accepted for position reported by clients, in milliseconds.
-        /// </summary>
-        /// <value>The maximum offset error accepted, in milliseconds.</value>
-        long MaxPlaybackOffset { get; }
-
-        /// <summary>
-        /// Gets the group identifier.
-        /// </summary>
-        /// <value>The group identifier.</value>
-        Guid GroupId { get; }
-
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        long PositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last activity.
-        /// </summary>
-        /// <value>The last activity.</value>
-        DateTime LastActivity { get; set; }
-
-        /// <summary>
-        /// Gets the play queue.
-        /// </summary>
-        /// <value>The play queue.</value>
-        PlayQueueManager PlayQueue { get; }
-
-        /// <summary>
-        /// Sets a new state.
-        /// </summary>
-        /// <param name="state">The new state.</param>
-        void SetState(ISyncPlayState state);
-
-        /// <summary>
-        /// Sends a GroupUpdate message to the interested sessions.
-        /// </summary>
-        /// <param name="from">The current session.</param>
-        /// <param name="type">The filtering type.</param>
-        /// <param name="message">The message to send.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The task.</returns>
-        Task SendGroupUpdate<T>(SessionInfo from, SyncPlayBroadcastType type, GroupUpdate<T> message, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Sends a playback command to the interested sessions.
-        /// </summary>
-        /// <param name="from">The current session.</param>
-        /// <param name="type">The filtering type.</param>
-        /// <param name="message">The message to send.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The task.</returns>
-        Task SendCommand(SessionInfo from, SyncPlayBroadcastType type, SendCommand message, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Builds a new playback command with some default values.
-        /// </summary>
-        /// <param name="type">The command type.</param>
-        /// <returns>The command.</returns>
-        SendCommand NewSyncPlayCommand(SendCommandType type);
-
-        /// <summary>
-        /// Builds a new group update message.
-        /// </summary>
-        /// <param name="type">The update type.</param>
-        /// <param name="data">The data to send.</param>
-        /// <returns>The group update.</returns>
-        GroupUpdate<T> NewSyncPlayGroupUpdate<T>(GroupUpdateType type, T data);
-
-        /// <summary>
-        /// Converts DateTime to UTC string.
-        /// </summary>
-        /// <param name="dateTime">The date to convert.</param>
-        /// <returns>The UTC string.</returns>
-        string DateToUTCString(DateTime dateTime);
-
-        /// <summary>
-        /// Sanitizes the PositionTicks, considers the current playing item when available.
-        /// </summary>
-        /// <param name="positionTicks">The PositionTicks.</param>
-        /// <returns>The sanitized position ticks.</returns>
-        long SanitizePositionTicks(long? positionTicks);
-
-        /// <summary>
-        /// Updates the ping of a session, in milliseconds.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="ping">The ping, in milliseconds.</param>
-        void UpdatePing(SessionInfo session, long ping);
-
-        /// <summary>
-        /// Gets the highest ping in the group, in milliseconds.
-        /// </summary>
-        /// <returns>The highest ping in the group.</returns>
-        long GetHighestPing();
-
-        /// <summary>
-        /// Sets the session's buffering state.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="isBuffering">The state.</param>
-        void SetBuffering(SessionInfo session, bool isBuffering);
-
-        /// <summary>
-        /// Sets the buffering state of all the sessions.
-        /// </summary>
-        /// <param name="isBuffering">The state.</param>
-        void SetAllBuffering(bool isBuffering);
-
-        /// <summary>
-        /// Gets the group buffering state.
-        /// </summary>
-        /// <returns><c>true</c> if there is a session buffering in the group; <c>false</c> otherwise.</returns>
-        bool IsBuffering();
-
-        /// <summary>
-        /// Sets the session's group wait state.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="ignoreGroupWait">The state.</param>
-        void SetIgnoreGroupWait(SessionInfo session, bool ignoreGroupWait);
-
-        /// <summary>
-        /// Sets a new play queue.
-        /// </summary>
-        /// <param name="playQueue">The new play queue.</param>
-        /// <param name="playingItemPosition">The playing item position in the play queue.</param>
-        /// <param name="startPositionTicks">The start position ticks.</param>
-        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool SetPlayQueue(Guid[] playQueue, int playingItemPosition, long startPositionTicks);
-
-        /// <summary>
-        /// Sets the playing item.
-        /// </summary>
-        /// <param name="playlistItemId">The new playing item identifier.</param>
-        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool SetPlayingItem(string playlistItemId);
-
-        /// <summary>
-        /// Removes items from the play queue.
-        /// </summary>
-        /// <param name="playlistItemIds">The items to remove.</param>
-        /// <returns><c>true</c> if playing item got removed; <c>false</c> otherwise.</returns>
-        bool RemoveFromPlayQueue(string[] playlistItemIds);
-
-        /// <summary>
-        /// Moves an item in the play queue.
-        /// </summary>
-        /// <param name="playlistItemId">The playlist identifier of the item to move.</param>
-        /// <param name="newIndex">The new position.</param>
-        /// <returns><c>true</c> if item has been moved; <c>false</c> if something went wrong.</returns>
-        bool MoveItemInPlayQueue(string playlistItemId, int newIndex);
-
-        /// <summary>
-        /// Updates the play queue.
-        /// </summary>
-        /// <param name="newItems">The new items to add to the play queue.</param>
-        /// <param name="mode">The mode with which the items will be added.</param>
-        /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool AddToPlayQueue(Guid[] newItems, string mode);
-
-        /// <summary>
-        /// Restarts current item in play queue.
-        /// </summary>
-        void RestartCurrentItem();
-
-        /// <summary>
-        /// Picks next item in play queue.
-        /// </summary>
-        /// <returns><c>true</c> if the item changed; <c>false</c> otherwise.</returns>
-        bool NextItemInQueue();
-
-        /// <summary>
-        /// Picks previous item in play queue.
-        /// </summary>
-        /// <returns><c>true</c> if the item changed; <c>false</c> otherwise.</returns>
-        bool PreviousItemInQueue();
-
-        /// <summary>
-        /// Sets the repeat mode.
-        /// </summary>
-        /// <param name="mode">The new mode.</param>
-        void SetRepeatMode(string mode);
-
-        /// <summary>
-        /// Sets the shuffle mode.
-        /// </summary>
-        /// <param name="mode">The new mode.</param>
-        void SetShuffleMode(string mode);
-
-        /// <summary>
-        /// Creates a play queue update.
-        /// </summary>
-        /// <param name="reason">The reason for the update.</param>
-        /// <returns>The play queue update.</returns>
-        PlayQueueUpdate GetPlayQueueUpdate(PlayQueueUpdateReason reason);
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/BufferGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/BufferGroupRequest.cs
deleted file mode 100644
index 65fced43f..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/BufferGroupRequest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class BufferGroupRequest.
-    /// </summary>
-    public class BufferGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets when the request has been made by the client.
-        /// </summary>
-        /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the client playback status.
-        /// </summary>
-        /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Buffer;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/IgnoreWaitGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/IgnoreWaitGroupRequest.cs
deleted file mode 100644
index 5466cbe2f..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/IgnoreWaitGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class IgnoreWaitGroupRequest.
-    /// </summary>
-    public class IgnoreWaitGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the client group-wait status.
-        /// </summary>
-        /// <value>The client group-wait status.</value>
-        public bool IgnoreWait { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.IgnoreWait;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/MovePlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/MovePlaylistItemGroupRequest.cs
deleted file mode 100644
index 38170facf..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/MovePlaylistItemGroupRequest.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class MovePlaylistItemGroupRequest.
-    /// </summary>
-    public class MovePlaylistItemGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playlist identifier of the item.
-        /// </summary>
-        /// <value>The playlist identifier of the item.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the new position.
-        /// </summary>
-        /// <value>The new position.</value>
-        public int NewIndex { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.MovePlaylistItem;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/NextTrackGroupRequest.cs
deleted file mode 100644
index b27c10f16..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/NextTrackGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class NextTrackGroupRequest.
-    /// </summary>
-    public class NextTrackGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.NextTrack;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PauseGroupRequest.cs
deleted file mode 100644
index facb25155..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PauseGroupRequest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PauseGroupRequest.
-    /// </summary>
-    public class PauseGroupRequest : IPlaybackGroupRequest
-    {
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Pause;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PingGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PingGroupRequest.cs
deleted file mode 100644
index 5605578d7..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PingGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PingGroupRequest.
-    /// </summary>
-    public class PingGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the ping time.
-        /// </summary>
-        /// <value>The ping time.</value>
-        public long Ping { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Ping;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PlayGroupRequest.cs
deleted file mode 100644
index f3dd769e4..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PlayGroupRequest.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PlayGroupRequest.
-    /// </summary>
-    public class PlayGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playing queue.
-        /// </summary>
-        /// <value>The playing queue.</value>
-        public Guid[] PlayingQueue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playing item from the queue.
-        /// </summary>
-        /// <value>The playing item.</value>
-        public int PlayingItemPosition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start position ticks.
-        /// </summary>
-        /// <value>The start position ticks.</value>
-        public long StartPositionTicks { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Play;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PreviousTrackGroupRequest.cs
deleted file mode 100644
index 31b93b967..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/PreviousTrackGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class PreviousTrackGroupRequest.
-    /// </summary>
-    public class PreviousTrackGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.PreviousTrack;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/QueueGroupRequest.cs
deleted file mode 100644
index 01c08cc86..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/QueueGroupRequest.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class QueueGroupRequest.
-    /// </summary>
-    public class QueueGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the items to queue.
-        /// </summary>
-        /// <value>The items to queue.</value>
-        public Guid[] ItemIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mode in which to add the new items.
-        /// </summary>
-        /// <value>The mode.</value>
-        public string Mode { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Queue;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/ReadyGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/ReadyGroupRequest.cs
deleted file mode 100644
index 8f266ed32..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/ReadyGroupRequest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class ReadyGroupRequest.
-    /// </summary>
-    public class ReadyGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets when the request has been made by the client.
-        /// </summary>
-        /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the client playback status.
-        /// </summary>
-        /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Ready;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/RemoveFromPlaylistGroupRequest.cs
deleted file mode 100644
index 78aeb9c6f..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/RemoveFromPlaylistGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class RemoveFromPlaylistGroupRequest.
-    /// </summary>
-    public class RemoveFromPlaylistGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playlist identifiers ot the items.
-        /// </summary>
-        /// <value>The playlist identifiers ot the items.</value>
-        public string[] PlaylistItemIds { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.RemoveFromPlaylist;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SeekGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SeekGroupRequest.cs
deleted file mode 100644
index 24d9be507..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SeekGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class SeekGroupRequest.
-    /// </summary>
-    public class SeekGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Seek;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetCurrentItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetCurrentItemGroupRequest.cs
deleted file mode 100644
index 070fd71d2..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetCurrentItemGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class SetPlaylistItemGroupRequest.
-    /// </summary>
-    public class SetPlaylistItemGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the playlist identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist identifier of the playing item.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.SetPlaylistItem;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetRepeatModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetRepeatModeGroupRequest.cs
deleted file mode 100644
index 5f36f60e4..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetRepeatModeGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class SetRepeatModeGroupRequest.
-    /// </summary>
-    public class SetRepeatModeGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the repeat mode.
-        /// </summary>
-        /// <value>The repeat mode.</value>
-        public string Mode { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.SetRepeatMode;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetShuffleModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetShuffleModeGroupRequest.cs
deleted file mode 100644
index 472455fd3..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/SetShuffleModeGroupRequest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class SetShuffleModeGroupRequest.
-    /// </summary>
-    public class SetShuffleModeGroupRequest : IPlaybackGroupRequest
-    {
-        /// <summary>
-        /// Gets or sets the shuffle mode.
-        /// </summary>
-        /// <value>The shuffle mode.</value>
-        public string Mode { get; set; }
-
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.SetShuffleMode;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/StopGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/StopGroupRequest.cs
deleted file mode 100644
index f1581c98d..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/StopGroupRequest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class StopGroupRequest.
-    /// </summary>
-    public class StopGroupRequest : IPlaybackGroupRequest
-    {
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Stop;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/UnpauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequest/UnpauseGroupRequest.cs
deleted file mode 100644
index 107295208..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequest/UnpauseGroupRequest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading;
-using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Controller.Session;
-
-namespace MediaBrowser.Controller.SyncPlay
-{
-    /// <summary>
-    /// Class UnpauseGroupRequest.
-    /// </summary>
-    public class UnpauseGroupRequest : IPlaybackGroupRequest
-    {
-        /// <inheritdoc />
-        public PlaybackRequestType GetRequestType()
-        {
-            return PlaybackRequestType.Unpause;
-        }
-
-        /// <inheritdoc />
-        public void Apply(ISyncPlayStateContext context, ISyncPlayState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.GetGroupState(), this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
new file mode 100644
index 000000000..b5bed89f2
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class BufferGroupRequest.
+    /// </summary>
+    public class BufferGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Buffer;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
new file mode 100644
index 000000000..325839f10
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class IgnoreWaitGroupRequest.
+    /// </summary>
+    public class IgnoreWaitGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the client should be ignored.
+        /// </summary>
+        /// <value>The client group-wait status.</value>
+        public bool IgnoreWait { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.IgnoreWait;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
new file mode 100644
index 000000000..3c95f53d4
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
@@ -0,0 +1,33 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class MovePlaylistItemGroupRequest.
+    /// </summary>
+    public class MovePlaylistItemGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the playlist identifier of the item.
+        /// </summary>
+        /// <value>The playlist identifier of the item.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new position.
+        /// </summary>
+        /// <value>The new position.</value>
+        public int NewIndex { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.MovePlaylistItem;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
new file mode 100644
index 000000000..8636d6f4d
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class NextTrackGroupRequest.
+    /// </summary>
+    public class NextTrackGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.NextTrack;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
new file mode 100644
index 000000000..45bd3b15f
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PauseGroupRequest.
+    /// </summary>
+    public class PauseGroupRequest : IGroupPlaybackRequest
+    {
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Pause;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
new file mode 100644
index 000000000..9dacb7985
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PingGroupRequest.
+    /// </summary>
+    public class PingGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the ping time.
+        /// </summary>
+        /// <value>The ping time.</value>
+        public long Ping { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Ping;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
new file mode 100644
index 000000000..e090a882e
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PlayGroupRequest.
+    /// </summary>
+    public class PlayGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets the playing queue.
+        /// </summary>
+        /// <value>The playing queue.</value>
+        public List<Guid> PlayingQueue { get; } = new List<Guid>();
+
+        /// <summary>
+        /// Gets or sets the playing item from the queue.
+        /// </summary>
+        /// <value>The playing item.</value>
+        public int PlayingItemPosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start position ticks.
+        /// </summary>
+        /// <value>The start position ticks.</value>
+        public long StartPositionTicks { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Play;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
new file mode 100644
index 000000000..aca5d678e
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class PreviousTrackGroupRequest.
+    /// </summary>
+    public class PreviousTrackGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.PreviousTrack;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
new file mode 100644
index 000000000..82380b209
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class QueueGroupRequest.
+    /// </summary>
+    public class QueueGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets the items to queue.
+        /// </summary>
+        /// <value>The items to queue.</value>
+        public List<Guid> ItemIds { get; } = new List<Guid>();
+
+        /// <summary>
+        /// Gets or sets the mode in which to add the new items.
+        /// </summary>
+        /// <value>The mode.</value>
+        public string Mode { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Queue;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
new file mode 100644
index 000000000..c8a2268cf
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class ReadyGroupRequest.
+    /// </summary>
+    public class ReadyGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Ready;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
new file mode 100644
index 000000000..4ead1301b
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class RemoveFromPlaylistGroupRequest.
+    /// </summary>
+    public class RemoveFromPlaylistGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets the playlist identifiers ot the items.
+        /// </summary>
+        /// <value>The playlist identifiers ot the items.</value>
+        public List<string> PlaylistItemIds { get; } = new List<string>();
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.RemoveFromPlaylist;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
new file mode 100644
index 000000000..d311bffdc
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class SeekGroupRequest.
+    /// </summary>
+    public class SeekGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Seek;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
new file mode 100644
index 000000000..0983d9129
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class SetPlaylistItemGroupRequest.
+    /// </summary>
+    public class SetPlaylistItemGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the playlist identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist identifier of the playing item.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetPlaylistItem;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
new file mode 100644
index 000000000..79373ef5f
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class SetRepeatModeGroupRequest.
+    /// </summary>
+    public class SetRepeatModeGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the repeat mode.
+        /// </summary>
+        /// <value>The repeat mode.</value>
+        public string Mode { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetRepeatMode;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
new file mode 100644
index 000000000..316fb49f4
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
@@ -0,0 +1,27 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class SetShuffleModeGroupRequest.
+    /// </summary>
+    public class SetShuffleModeGroupRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Gets or sets the shuffle mode.
+        /// </summary>
+        /// <value>The shuffle mode.</value>
+        public string Mode { get; set; }
+
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetShuffleMode;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
new file mode 100644
index 000000000..9f6f8ea63
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class StopGroupRequest.
+    /// </summary>
+    public class StopGroupRequest : IGroupPlaybackRequest
+    {
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Stop;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
new file mode 100644
index 000000000..84a6b0a6e
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Class UnpauseGroupRequest.
+    /// </summary>
+    public class UnpauseGroupRequest : IGroupPlaybackRequest
+    {
+        /// <inheritdoc />
+        public PlaybackRequestType Type { get; } = PlaybackRequestType.Unpause;
+
+        /// <inheritdoc />
+        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
index 030005abe..8bc21a6a8 100644
--- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
@@ -5,163 +5,96 @@ using MediaBrowser.Model.SyncPlay;
 
 namespace MediaBrowser.Controller.SyncPlay
 {
-    static class ListShuffleExtension
-    {
-        private static Random rng = new Random();
-        public static void Shuffle<T>(this IList<T> list)
-        {
-            int n = list.Count;
-            while (n > 1)
-            {
-                n--;
-                int k = rng.Next(n + 1);
-                T value = list[k];
-                list[k] = list[n];
-                list[n] = value;
-            }
-        }
-    }
-
     /// <summary>
     /// Class PlayQueueManager.
     /// </summary>
     public class PlayQueueManager
     {
         /// <summary>
-        /// Gets or sets the playing item index.
+        /// Placeholder index for when no item is playing.
         /// </summary>
-        /// <value>The playing item index.</value>
-        public int PlayingItemIndex { get; private set; }
+        /// <value>The no-playing item index.</value>
+        private const int NoPlayingItemIndex = -1;
 
         /// <summary>
-        /// Gets or sets the last time the queue has been changed.
+        /// Random number generator used to shuffle lists.
         /// </summary>
-        /// <value>The last time the queue has been changed.</value>
-        public DateTime LastChange { get; private set; }
+        /// <value>The random number generator.</value>
+        private readonly Random randomNumberGenerator = new Random();
 
         /// <summary>
-        /// Gets the sorted playlist.
+        /// Initializes a new instance of the <see cref="PlayQueueManager" /> class.
         /// </summary>
-        /// <value>The sorted playlist, or play queue of the group.</value>
-        private List<QueueItem> SortedPlaylist { get; set; } = new List<QueueItem>();
+        public PlayQueueManager()
+        {
+            Reset();
+        }
 
         /// <summary>
-        /// Gets the shuffled playlist.
+        /// Gets the playing item index.
         /// </summary>
-        /// <value>The shuffled playlist, or play queue of the group.</value>
-        private List<QueueItem> ShuffledPlaylist { get; set; } = new List<QueueItem>();
+        /// <value>The playing item index.</value>
+        public int PlayingItemIndex { get; private set; }
 
         /// <summary>
-        /// Gets or sets the shuffle mode.
+        /// Gets the last time the queue has been changed.
+        /// </summary>
+        /// <value>The last time the queue has been changed.</value>
+        public DateTime LastChange { get; private set; }
+
+        /// <summary>
+        /// Gets the shuffle mode.
         /// </summary>
         /// <value>The shuffle mode.</value>
         public GroupShuffleMode ShuffleMode { get; private set; } = GroupShuffleMode.Sorted;
 
         /// <summary>
-        /// Gets or sets the repeat mode.
+        /// Gets the repeat mode.
         /// </summary>
         /// <value>The repeat mode.</value>
         public GroupRepeatMode RepeatMode { get; private set; } = GroupRepeatMode.RepeatNone;
 
         /// <summary>
-        /// Gets or sets the progressive identifier counter.
+        /// Gets or sets the sorted playlist.
         /// </summary>
-        /// <value>The progressive identifier.</value>
-        private int ProgressiveId { get; set; } = 0;
-
-        /// <summary>
-        /// Placeholder index for when no item is playing.
-        /// </summary>
-        /// <value>The no-playing item index.</value>
-        private const int NoPlayingItemIndex = -1;
+        /// <value>The sorted playlist, or play queue of the group.</value>
+        private List<QueueItem> SortedPlaylist { get; set; } = new List<QueueItem>();
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PlayQueueManager" /> class.
+        /// Gets or sets the shuffled playlist.
         /// </summary>
-        public PlayQueueManager()
-        {
-            Reset();
-        }
+        /// <value>The shuffled playlist, or play queue of the group.</value>
+        private List<QueueItem> ShuffledPlaylist { get; set; } = new List<QueueItem>();
 
         /// <summary>
-        /// Gets the next available identifier.
+        /// Gets or sets the progressive identifier counter.
         /// </summary>
-        /// <returns>The next available identifier.</returns>
-        private int GetNextProgressiveId() {
-            return ProgressiveId++;
-        }
+        /// <value>The progressive identifier.</value>
+        private int ProgressiveId { get; set; }
 
         /// <summary>
-        /// Creates a list from the array of items. Each item is given an unique playlist identifier.
+        /// Checks if an item is playing.
         /// </summary>
-        /// <returns>The list of queue items.</returns>
-        private List<QueueItem> CreateQueueItemsFromArray(Guid[] items)
+        /// <returns><c>true</c> if an item is playing; <c>false</c> otherwise.</returns>
+        public bool IsItemPlaying()
         {
-            return items.ToList()
-                .Select(item => new QueueItem()
-                {
-                    ItemId = item,
-                    PlaylistItemId = "syncPlayItem" + GetNextProgressiveId()
-                })
-                .ToList();
+            return PlayingItemIndex != NoPlayingItemIndex;
         }
 
         /// <summary>
-        /// Gets the current playlist, depending on the shuffle mode.
+        /// Gets the current playlist considering the shuffle mode.
         /// </summary>
         /// <returns>The playlist.</returns>
-        private List<QueueItem> GetPlaylistAsList()
+        public IReadOnlyList<QueueItem> GetPlaylist()
         {
-            if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
-            {
-                return ShuffledPlaylist;
-            }
-            else
-            {
-                return SortedPlaylist;
-            }
-        }
-
-        /// <summary>
-        /// Gets the current playing item, depending on the shuffle mode.
-        /// </summary>
-        /// <returns>The playing item.</returns>
-        private QueueItem GetPlayingItem()
-        {
-            if (PlayingItemIndex == NoPlayingItemIndex)
-            {
-                return null;
-            }
-            else if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
-            {
-                return ShuffledPlaylist[PlayingItemIndex];
-            }
-            else
-            {
-                return SortedPlaylist[PlayingItemIndex];
-            }
-        }
-
-        /// <summary>
-        /// Gets the current playlist as an array, depending on the shuffle mode.
-        /// </summary>
-        /// <returns>The array of items in the playlist.</returns>
-        public QueueItem[] GetPlaylist() {
-            if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
-            {
-                return ShuffledPlaylist.ToArray();
-            }
-            else
-            {
-                return SortedPlaylist.ToArray();
-            }
+            return GetPlaylistInternal();
         }
 
         /// <summary>
         /// Sets a new playlist. Playing item is reset.
         /// </summary>
         /// <param name="items">The new items of the playlist.</param>
-        public void SetPlaylist(Guid[] items)
+        public void SetPlaylist(IEnumerable<Guid> items)
         {
             SortedPlaylist.Clear();
             ShuffledPlaylist.Clear();
@@ -170,7 +103,7 @@ namespace MediaBrowser.Controller.SyncPlay
             if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
             {
                 ShuffledPlaylist = SortedPlaylist.ToList();
-                ShuffledPlaylist.Shuffle();
+                Shuffle(ShuffledPlaylist);
             }
 
             PlayingItemIndex = NoPlayingItemIndex;
@@ -181,7 +114,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// Appends new items to the playlist. The specified order is mantained.
         /// </summary>
         /// <param name="items">The items to add to the playlist.</param>
-        public void Queue(Guid[] items)
+        public void Queue(IEnumerable<Guid> items)
         {
             var newItems = CreateQueueItemsFromArray(items);
 
@@ -195,13 +128,14 @@ namespace MediaBrowser.Controller.SyncPlay
         }
 
         /// <summary>
-        /// Shuffles the playlist. Shuffle mode is changed.
+        /// Shuffles the playlist. Shuffle mode is changed. The playlist gets re-shuffled if already shuffled.
         /// </summary>
         public void ShufflePlaylist()
         {
-            if (PlayingItemIndex == NoPlayingItemIndex) {
+            if (PlayingItemIndex == NoPlayingItemIndex)
+            {
                 ShuffledPlaylist = SortedPlaylist.ToList();
-                ShuffledPlaylist.Shuffle();
+                Shuffle(ShuffledPlaylist);
             }
             else if (ShuffleMode.Equals(GroupShuffleMode.Sorted))
             {
@@ -209,7 +143,7 @@ namespace MediaBrowser.Controller.SyncPlay
                 var playingItem = SortedPlaylist[PlayingItemIndex];
                 ShuffledPlaylist = SortedPlaylist.ToList();
                 ShuffledPlaylist.RemoveAt(PlayingItemIndex);
-                ShuffledPlaylist.Shuffle();
+                Shuffle(ShuffledPlaylist);
                 ShuffledPlaylist = ShuffledPlaylist.Prepend(playingItem).ToList();
                 PlayingItemIndex = 0;
             }
@@ -218,7 +152,7 @@ namespace MediaBrowser.Controller.SyncPlay
                 // Re-shuffle playlist.
                 var playingItem = ShuffledPlaylist[PlayingItemIndex];
                 ShuffledPlaylist.RemoveAt(PlayingItemIndex);
-                ShuffledPlaylist.Shuffle();
+                Shuffle(ShuffledPlaylist);
                 ShuffledPlaylist = ShuffledPlaylist.Prepend(playingItem).ToList();
                 PlayingItemIndex = 0;
             }
@@ -262,6 +196,7 @@ namespace MediaBrowser.Controller.SyncPlay
                 {
                     ShuffledPlaylist.Add(playingItem);
                 }
+
                 PlayingItemIndex = 0;
             }
             else
@@ -274,7 +209,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// Adds new items to the playlist right after the playing item. The specified order is mantained.
         /// </summary>
         /// <param name="items">The items to add to the playlist.</param>
-        public void QueueNext(Guid[] items)
+        public void QueueNext(IEnumerable<Guid> items)
         {
             var newItems = CreateQueueItemsFromArray(items);
 
@@ -334,8 +269,18 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="itemId">The new playing item identifier.</param>
         public void SetPlayingItemById(Guid itemId)
         {
-            var itemIds = GetPlaylistAsList().Select(queueItem => queueItem.ItemId).ToList();
-            PlayingItemIndex = itemIds.IndexOf(itemId);
+            PlayingItemIndex = NoPlayingItemIndex;
+
+            var playlist = GetPlaylistInternal();
+            foreach (var item in playlist)
+            {
+                if (item.ItemId.Equals(itemId))
+                {
+                    PlayingItemIndex = playlist.IndexOf(item);
+                    break;
+                }
+            }
+
             LastChange = DateTime.UtcNow;
         }
 
@@ -346,8 +291,18 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <returns><c>true</c> if playing item has been set; <c>false</c> if item is not in the playlist.</returns>
         public bool SetPlayingItemByPlaylistId(string playlistItemId)
         {
-            var playlistIds = GetPlaylistAsList().Select(queueItem => queueItem.PlaylistItemId).ToList();
-            PlayingItemIndex = playlistIds.IndexOf(playlistItemId);
+            PlayingItemIndex = NoPlayingItemIndex;
+
+            var playlist = GetPlaylistInternal();
+            foreach (var item in playlist)
+            {
+                if (item.PlaylistItemId.Equals(playlistItemId, StringComparison.OrdinalIgnoreCase))
+                {
+                    PlayingItemIndex = playlist.IndexOf(item);
+                    break;
+                }
+            }
+
             LastChange = DateTime.UtcNow;
             return PlayingItemIndex != NoPlayingItemIndex;
         }
@@ -358,8 +313,8 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="playlistIndex">The new playing item index.</param>
         public void SetPlayingItemByIndex(int playlistIndex)
         {
-            var list = GetPlaylistAsList();
-            if (playlistIndex < 0 || playlistIndex > list.Count())
+            var playlist = GetPlaylistInternal();
+            if (playlistIndex < 0 || playlistIndex > playlist.Count)
             {
                 PlayingItemIndex = NoPlayingItemIndex;
             }
@@ -376,7 +331,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// </summary>
         /// <param name="playlistItemIds">The items to remove.</param>
         /// <returns><c>true</c> if playing item got removed; <c>false</c> otherwise.</returns>
-        public bool RemoveFromPlaylist(string[] playlistItemIds)
+        public bool RemoveFromPlaylist(IEnumerable<string> playlistItemIds)
         {
             var playingItem = GetPlayingItem();
             var playlistItemIdsList = playlistItemIds.ToList();
@@ -396,7 +351,7 @@ namespace MediaBrowser.Controller.SyncPlay
                     {
                         // Was first element, picking next if available.
                         // Default to no playing item otherwise.
-                        PlayingItemIndex = SortedPlaylist.Count() > 0 ? 0 : NoPlayingItemIndex;
+                        PlayingItemIndex = SortedPlaylist.Count > 0 ? 0 : NoPlayingItemIndex;
                     }
 
                     return true;
@@ -422,24 +377,32 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <returns><c>true</c> if the item has been moved; <c>false</c> otherwise.</returns>
         public bool MovePlaylistItem(string playlistItemId, int newIndex)
         {
-            var list = GetPlaylistAsList();
+            var playlist = GetPlaylistInternal();
             var playingItem = GetPlayingItem();
 
-            var playlistIds = list.Select(queueItem => queueItem.PlaylistItemId).ToList();
-            var oldIndex = playlistIds.IndexOf(playlistItemId);
+            var oldIndex = -1;
+            foreach (var item in playlist)
+            {
+                if (item.PlaylistItemId.Equals(playlistItemId, StringComparison.OrdinalIgnoreCase))
+                {
+                    oldIndex = playlist.IndexOf(item);
+                    break;
+                }
+            }
+
             if (oldIndex < 0)
             {
                 return false;
             }
 
-            var queueItem = list[oldIndex];
-            list.RemoveAt(oldIndex);
-            newIndex = Math.Min(newIndex, list.Count());
+            var queueItem = playlist[oldIndex];
+            playlist.RemoveAt(oldIndex);
+            newIndex = Math.Min(newIndex, playlist.Count);
             newIndex = Math.Max(newIndex, 0);
-            list.Insert(newIndex, queueItem);
+            playlist.Insert(newIndex, queueItem);
 
             LastChange = DateTime.UtcNow;
-            PlayingItemIndex = list.IndexOf(playingItem);
+            PlayingItemIndex = playlist.IndexOf(playingItem);
             return true;
         }
 
@@ -505,7 +468,7 @@ namespace MediaBrowser.Controller.SyncPlay
         public QueueItem GetNextItemPlaylistId()
         {
             int newIndex;
-            var playlist = GetPlaylistAsList();
+            var playlist = GetPlaylistInternal();
 
             switch (RepeatMode)
             {
@@ -514,17 +477,18 @@ namespace MediaBrowser.Controller.SyncPlay
                     break;
                 case GroupRepeatMode.RepeatAll:
                     newIndex = PlayingItemIndex + 1;
-                    if (newIndex >= playlist.Count())
+                    if (newIndex >= playlist.Count)
                     {
                         newIndex = 0;
                     }
+
                     break;
                 default:
                     newIndex = PlayingItemIndex + 1;
                     break;
             }
 
-            if (newIndex < 0 || newIndex >= playlist.Count())
+            if (newIndex < 0 || newIndex >= playlist.Count)
             {
                 return null;
             }
@@ -545,7 +509,7 @@ namespace MediaBrowser.Controller.SyncPlay
             }
 
             PlayingItemIndex++;
-            if (PlayingItemIndex >= SortedPlaylist.Count())
+            if (PlayingItemIndex >= SortedPlaylist.Count)
             {
                 if (RepeatMode.Equals(GroupRepeatMode.RepeatAll))
                 {
@@ -579,7 +543,7 @@ namespace MediaBrowser.Controller.SyncPlay
             {
                 if (RepeatMode.Equals(GroupRepeatMode.RepeatAll))
                 {
-                    PlayingItemIndex = SortedPlaylist.Count() - 1;
+                    PlayingItemIndex = SortedPlaylist.Count - 1;
                 }
                 else
                 {
@@ -591,5 +555,86 @@ namespace MediaBrowser.Controller.SyncPlay
             LastChange = DateTime.UtcNow;
             return true;
         }
+
+        /// <summary>
+        /// Shuffles a given list.
+        /// </summary>
+        /// <param name="list">The list to shuffle.</param>
+        private void Shuffle<T>(IList<T> list)
+        {
+            int n = list.Count;
+            while (n > 1)
+            {
+                n--;
+                int k = randomNumberGenerator.Next(n + 1);
+                T value = list[k];
+                list[k] = list[n];
+                list[n] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the next available identifier.
+        /// </summary>
+        /// <returns>The next available identifier.</returns>
+        private int GetNextProgressiveId()
+        {
+            return ProgressiveId++;
+        }
+
+        /// <summary>
+        /// Creates a list from the array of items. Each item is given an unique playlist identifier.
+        /// </summary>
+        /// <returns>The list of queue items.</returns>
+        private List<QueueItem> CreateQueueItemsFromArray(IEnumerable<Guid> items)
+        {
+            var list = new List<QueueItem>();
+            foreach (var item in items)
+            {
+                list.Add(new QueueItem()
+                {
+                    ItemId = item,
+                    PlaylistItemId = "syncPlayItem" + GetNextProgressiveId()
+                });
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Gets the current playlist considering the shuffle mode.
+        /// </summary>
+        /// <returns>The playlist.</returns>
+        private List<QueueItem> GetPlaylistInternal()
+        {
+            if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
+            {
+                return ShuffledPlaylist;
+            }
+            else
+            {
+                return SortedPlaylist;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current playing item, depending on the shuffle mode.
+        /// </summary>
+        /// <returns>The playing item.</returns>
+        private QueueItem GetPlayingItem()
+        {
+            if (PlayingItemIndex == NoPlayingItemIndex)
+            {
+                return null;
+            }
+            else if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
+            {
+                return ShuffledPlaylist[PlayingItemIndex];
+            }
+            else
+            {
+                return SortedPlaylist[PlayingItemIndex];
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
index 255f6812b..85b9a3522 100644
--- a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the group state.
         /// </summary>
         /// <value>The group state.</value>
-        public GroupState State { get; set; }
+        public GroupStateType State { get; set; }
 
         /// <summary>
         /// Gets or sets the participants.
diff --git a/MediaBrowser.Model/SyncPlay/GroupState.cs b/MediaBrowser.Model/SyncPlay/GroupState.cs
deleted file mode 100644
index 871634d55..000000000
--- a/MediaBrowser.Model/SyncPlay/GroupState.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay
-{
-    /// <summary>
-    /// Enum GroupState.
-    /// </summary>
-    public enum GroupState
-    {
-        /// <summary>
-        /// The group is in idle state. No media is playing.
-        /// </summary>
-        Idle,
-        /// <summary>
-        /// The group is in wating state. Playback is paused. Will start playing when users are ready.
-        /// </summary>
-        Waiting,
-        /// <summary>
-        /// The group is in paused state. Playback is paused. Will resume on play command.
-        /// </summary>
-        Paused,
-        /// <summary>
-        /// The group is in playing state. Playback is advancing.
-        /// </summary>
-        Playing
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/GroupStateType.cs b/MediaBrowser.Model/SyncPlay/GroupStateType.cs
new file mode 100644
index 000000000..341859b30
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/GroupStateType.cs
@@ -0,0 +1,28 @@
+namespace MediaBrowser.Model.SyncPlay
+{
+    /// <summary>
+    /// Enum GroupState.
+    /// </summary>
+    public enum GroupStateType
+    {
+        /// <summary>
+        /// The group is in idle state. No media is playing.
+        /// </summary>
+        Idle,
+
+        /// <summary>
+        /// The group is in wating state. Playback is paused. Will start playing when users are ready.
+        /// </summary>
+        Waiting,
+
+        /// <summary>
+        /// The group is in paused state. Playback is paused. Will resume on play command.
+        /// </summary>
+        Paused,
+
+        /// <summary>
+        /// The group is in playing state. Playback is advancing.
+        /// </summary>
+        Playing
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs b/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
index 7c7b267e6..532b5a56f 100644
--- a/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>
@@ -11,7 +9,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the state of the group.
         /// </summary>
         /// <value>The state of the group.</value>
-        public GroupState State { get; set; }
+        public GroupStateType State { get; set; }
 
         /// <summary>
         /// Gets or sets the reason of the state change.
diff --git a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
index 8c7208211..12d6058ac 100644
--- a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
@@ -5,6 +5,7 @@ namespace MediaBrowser.Model.SyncPlay
     /// <summary>
     /// Class GroupUpdate.
     /// </summary>
+    /// <typeparam name="T">The type of the data of the message.</typeparam>
     public class GroupUpdate<T>
     {
         /// <summary>
diff --git a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
index 5e2740a89..575597e62 100644
--- a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
@@ -1,5 +1,7 @@
 #nullable disable
 
+using System.Collections.Generic;
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>
@@ -23,7 +25,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the playlist.
         /// </summary>
         /// <value>The playlist.</value>
-        public QueueItem[] Playlist { get; set; }
+        public IReadOnlyList<QueueItem> Playlist { get; set; }
 
         /// <summary>
         /// Gets or sets the playing item index in the playlist.
diff --git a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
index 0d0f48ea9..4809dc44f 100644
--- a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
@@ -69,6 +69,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// A user is requesting previous track in playlist.
         /// </summary>
         PreviousTrack = 12,
+
         /// <summary>
         /// A user is setting the repeat mode.
         /// </summary>
-- 
cgit v1.2.3


From 5d77f422f0e4998130f1defebd08e053188a1a25 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Sat, 14 Nov 2020 23:40:01 +0100
Subject: Hide some property setters, init null values, update namespaces

---
 .../SyncPlay/GroupController.cs                    | 49 +++---------
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 93 +++++-----------------
 .../SyncPlay/GroupStates/AbstractGroupState.cs     | 10 ++-
 .../SyncPlay/GroupStates/IdleGroupState.cs         |  3 +-
 .../SyncPlay/GroupStates/PausedGroupState.cs       |  3 +-
 .../SyncPlay/GroupStates/PlayingGroupState.cs      |  3 +-
 .../SyncPlay/GroupStates/WaitingGroupState.cs      |  6 +-
 .../SyncPlay/IGroupController.cs                   |  1 +
 MediaBrowser.Controller/SyncPlay/IGroupState.cs    |  1 +
 .../SyncPlay/IGroupStateContext.cs                 | 14 +---
 .../PlaybackRequests/BufferGroupRequest.cs         | 33 +++++---
 .../PlaybackRequests/IgnoreWaitGroupRequest.cs     | 15 +++-
 .../MovePlaylistItemGroupRequest.cs                | 21 +++--
 .../PlaybackRequests/NextTrackGroupRequest.cs      | 15 +++-
 .../SyncPlay/PlaybackRequests/PauseGroupRequest.cs |  2 +-
 .../SyncPlay/PlaybackRequests/PingGroupRequest.cs  | 15 +++-
 .../SyncPlay/PlaybackRequests/PlayGroupRequest.cs  | 29 +++++--
 .../PlaybackRequests/PreviousTrackGroupRequest.cs  | 15 +++-
 .../SyncPlay/PlaybackRequests/QueueGroupRequest.cs | 27 +++++--
 .../SyncPlay/PlaybackRequests/ReadyGroupRequest.cs | 33 +++++---
 .../RemoveFromPlaylistGroupRequest.cs              | 15 +++-
 .../SyncPlay/PlaybackRequests/SeekGroupRequest.cs  | 15 +++-
 .../SetPlaylistItemGroupRequest.cs                 | 15 +++-
 .../PlaybackRequests/SetRepeatModeGroupRequest.cs  | 15 +++-
 .../PlaybackRequests/SetShuffleModeGroupRequest.cs | 15 +++-
 .../SyncPlay/PlaybackRequests/StopGroupRequest.cs  |  2 +-
 .../PlaybackRequests/UnpauseGroupRequest.cs        |  2 +-
 .../SyncPlay/Queue/PlayQueueManager.cs             |  9 +--
 MediaBrowser.Model/SyncPlay/GroupInfoDto.cs        | 15 +++-
 MediaBrowser.Model/SyncPlay/GroupQueueMode.cs      | 18 +++++
 MediaBrowser.Model/SyncPlay/GroupRequestType.cs    | 10 +--
 MediaBrowser.Model/SyncPlay/GroupStateType.cs      |  8 +-
 MediaBrowser.Model/SyncPlay/NewGroupRequest.cs     | 10 ++-
 MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs     | 13 ++-
 .../SyncPlay/PlayQueueUpdateReason.cs              |  4 +-
 MediaBrowser.Model/SyncPlay/QueueItem.cs           | 21 +++--
 MediaBrowser.Model/SyncPlay/SendCommand.cs         | 15 +++-
 37 files changed, 363 insertions(+), 227 deletions(-)
 create mode 100644 MediaBrowser.Model/SyncPlay/GroupQueueMode.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs
index 5447aad5d..a0d951b3e 100644
--- a/Emby.Server.Implementations/SyncPlay/GroupController.cs
+++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs
@@ -10,6 +10,8 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
+using MediaBrowser.Controller.SyncPlay.GroupStates;
+using MediaBrowser.Controller.SyncPlay.Queue;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
@@ -358,7 +360,7 @@ namespace Emby.Server.Implementations.SyncPlay
                 GroupName = GroupName,
                 State = _state.Type,
                 Participants = Participants.Values.Select(session => session.Session.UserName).Distinct().ToList(),
-                LastUpdatedAt = DateToUTCString(DateTime.UtcNow)
+                LastUpdatedAt = DateTime.UtcNow
             };
         }
 
@@ -422,8 +424,8 @@ namespace Emby.Server.Implementations.SyncPlay
                 PlaylistItemId = PlayQueue.GetPlayingItemPlaylistId(),
                 PositionTicks = PositionTicks,
                 Command = type,
-                When = DateToUTCString(LastActivity),
-                EmittedAt = DateToUTCString(DateTime.UtcNow)
+                When = LastActivity,
+                EmittedAt = DateTime.UtcNow
             };
         }
 
@@ -438,12 +440,6 @@ namespace Emby.Server.Implementations.SyncPlay
             };
         }
 
-        /// <inheritdoc />
-        public string DateToUTCString(DateTime dateTime)
-        {
-            return dateTime.ToUniversalTime().ToString("o", CultureInfo.InvariantCulture);
-        }
-
         /// <inheritdoc />
         public long SanitizePositionTicks(long? positionTicks)
         {
@@ -580,7 +576,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool AddToPlayQueue(IEnumerable<Guid> newItems, string mode)
+        public bool AddToPlayQueue(IEnumerable<Guid> newItems, GroupQueueMode mode)
         {
             // Ignore on empty list.
             if (!newItems.Any())
@@ -594,7 +590,7 @@ namespace Emby.Server.Implementations.SyncPlay
                 return false;
             }
 
-            if (mode.Equals("next", StringComparison.OrdinalIgnoreCase))
+            if (mode.Equals(GroupQueueMode.QueueNext))
             {
                 PlayQueue.QueueNext(newItems);
             }
@@ -648,36 +644,15 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SetRepeatMode(string mode)
+        public void SetRepeatMode(GroupRepeatMode mode)
         {
-            switch (mode)
-            {
-                case "RepeatOne":
-                    PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatOne);
-                    break;
-                case "RepeatAll":
-                    PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatAll);
-                    break;
-                default:
-                    // On unknown values, default to repeat none.
-                    PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatNone);
-                    break;
-            }
+            PlayQueue.SetRepeatMode(mode);
         }
 
         /// <inheritdoc />
-        public void SetShuffleMode(string mode)
+        public void SetShuffleMode(GroupShuffleMode mode)
         {
-            switch (mode)
-            {
-                case "Shuffle":
-                    PlayQueue.SetShuffleMode(GroupShuffleMode.Shuffle);
-                    break;
-                default:
-                    // On unknown values, default to sorted playlist.
-                    PlayQueue.SetShuffleMode(GroupShuffleMode.Sorted);
-                    break;
-            }
+            PlayQueue.SetShuffleMode(mode);
         }
 
         /// <inheritdoc />
@@ -701,7 +676,7 @@ namespace Emby.Server.Implementations.SyncPlay
             return new PlayQueueUpdate()
             {
                 Reason = reason,
-                LastUpdate = DateToUTCString(PlayQueue.LastChange),
+                LastUpdate = PlayQueue.LastChange,
                 Playlist = PlayQueue.GetPlaylist(),
                 PlayingItemIndex = PlayQueue.PlayingItemIndex,
                 StartPositionTicks = startPositionTicks,
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 6bd78179b..9085a71c8 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -7,6 +7,7 @@ using Jellyfin.Api.Helpers;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -118,17 +119,12 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Play")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPlay(
-            [FromQuery, Required] string playingQueue,
+            [FromQuery, Required] Guid[] playingQueue,
             [FromQuery, Required] int playingItemPosition,
             [FromQuery, Required] long startPositionTicks)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlayGroupRequest()
-            {
-                PlayingItemPosition = playingItemPosition,
-                StartPositionTicks = startPositionTicks
-            };
-            syncPlayRequest.PlayingQueue.AddRange(RequestHelpers.GetGuids(playingQueue));
+            var syncPlayRequest = new PlayGroupRequest(playingQueue, playingItemPosition, startPositionTicks);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -145,10 +141,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string playlistItemId)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetPlaylistItemGroupRequest()
-            {
-                PlaylistItemId = playlistItemId
-            };
+            var syncPlayRequest = new SetPlaylistItemGroupRequest(playlistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -165,8 +158,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string[] playlistItemIds)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new RemoveFromPlaylistGroupRequest();
-            syncPlayRequest.PlaylistItemIds.AddRange(playlistItemIds);
+            var syncPlayRequest = new RemoveFromPlaylistGroupRequest(playlistItemIds);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -185,11 +177,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] int newIndex)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new MovePlaylistItemGroupRequest()
-            {
-                PlaylistItemId = playlistItemId,
-                NewIndex = newIndex
-            };
+            var syncPlayRequest = new MovePlaylistItemGroupRequest(playlistItemId, newIndex);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -197,22 +185,18 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to queue items to the playlist of a SyncPlay group.
         /// </summary>
-        /// <param name="itemIds">The items to add. Item ids, comma delimited.</param>
-        /// <param name="mode">The mode in which to queue items.</param>
+        /// <param name="items">The items to add.</param>
+        /// <param name="mode">The mode in which to enqueue the items.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayQueue(
-            [FromQuery, Required] string itemIds,
-            [FromQuery, Required] string mode)
+            [FromQuery, Required] Guid[] items,
+            [FromQuery, Required] GroupQueueMode mode)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new QueueGroupRequest()
-            {
-                Mode = mode
-            };
-            syncPlayRequest.ItemIds.AddRange(RequestHelpers.GetGuids(itemIds));
+            var syncPlayRequest = new QueueGroupRequest(items, mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -274,10 +258,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] long positionTicks)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SeekGroupRequest()
-            {
-                PositionTicks = positionTicks
-            };
+            var syncPlayRequest = new SeekGroupRequest(positionTicks);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -305,23 +286,11 @@ namespace Jellyfin.Api.Controllers
             IGroupPlaybackRequest syncPlayRequest;
             if (!bufferingDone)
             {
-                syncPlayRequest = new BufferGroupRequest()
-                {
-                    When = when,
-                    PositionTicks = positionTicks,
-                    IsPlaying = isPlaying,
-                    PlaylistItemId = playlistItemId
-                };
+                syncPlayRequest = new BufferGroupRequest(when, positionTicks, isPlaying, playlistItemId);
             }
             else
             {
-                syncPlayRequest = new ReadyGroupRequest()
-                {
-                    When = when,
-                    PositionTicks = positionTicks,
-                    IsPlaying = isPlaying,
-                    PlaylistItemId = playlistItemId
-                };
+                syncPlayRequest = new ReadyGroupRequest(when, positionTicks, isPlaying, playlistItemId);
             }
 
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
@@ -340,10 +309,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] bool ignoreWait)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new IgnoreWaitGroupRequest()
-            {
-                IgnoreWait = ignoreWait
-            };
+            var syncPlayRequest = new IgnoreWaitGroupRequest(ignoreWait);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -360,10 +326,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string playlistItemId)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new NextTrackGroupRequest()
-            {
-                PlaylistItemId = playlistItemId
-            };
+            var syncPlayRequest = new NextTrackGroupRequest(playlistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -380,10 +343,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string playlistItemId)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PreviousTrackGroupRequest()
-            {
-                PlaylistItemId = playlistItemId
-            };
+            var syncPlayRequest = new PreviousTrackGroupRequest(playlistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -397,13 +357,10 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetRepeatMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetRepeatMode(
-            [FromQuery, Required] string mode)
+            [FromQuery, Required] GroupRepeatMode mode)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetRepeatModeGroupRequest()
-            {
-                Mode = mode
-            };
+            var syncPlayRequest = new SetRepeatModeGroupRequest(mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -417,13 +374,10 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetShuffleMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetShuffleMode(
-            [FromQuery, Required] string mode)
+            [FromQuery, Required] GroupShuffleMode mode)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetShuffleModeGroupRequest()
-            {
-                Mode = mode
-            };
+            var syncPlayRequest = new SetShuffleModeGroupRequest(mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -440,10 +394,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] double ping)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PingGroupRequest()
-            {
-                Ping = Convert.ToInt64(ping)
-            };
+            var syncPlayRequest = new PingGroupRequest(Convert.ToInt64(ping));
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
index 829ef2bba..bc2e22380 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
@@ -1,10 +1,10 @@
-using System;
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.GroupStates
 {
     /// <summary>
     /// Class AbstractGroupState.
@@ -104,7 +104,11 @@ namespace MediaBrowser.Controller.SyncPlay
                 return;
             }
 
-            var reason = request.Mode.Equals("next", StringComparison.OrdinalIgnoreCase) ? PlayQueueUpdateReason.QueueNext : PlayQueueUpdateReason.Queue;
+            var reason = request.Mode switch
+            {
+                GroupQueueMode.QueueNext => PlayQueueUpdateReason.QueueNext,
+                _ => PlayQueueUpdateReason.Queue
+            };
             var playQueueUpdate = context.GetPlayQueueUpdate(reason);
             var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
             context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
index d9350cc9b..660afb607 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
@@ -1,9 +1,10 @@
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.GroupStates
 {
     /// <summary>
     /// Class IdleGroupState.
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
index 5ae478605..29942898e 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.GroupStates
 {
     /// <summary>
     /// Class PausedGroupState.
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
index 394c64e51..c5d73dedb 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.GroupStates
 {
     /// <summary>
     /// Class PlayingGroupState.
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
index c78077b35..78318dd94 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.GroupStates
 {
     /// <summary>
     /// Class WaitingGroupState.
@@ -464,8 +465,7 @@ namespace MediaBrowser.Controller.SyncPlay
                 {
                     // Others are still buffering, tell this client to pause when ready.
                     var command = context.NewSyncPlayCommand(SendCommandType.Pause);
-                    var pauseAtTime = currentTime.AddTicks(delayTicks);
-                    command.When = context.DateToUTCString(pauseAtTime);
+                    command.When = currentTime.AddTicks(delayTicks);
                     context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
 
                     Logger.LogInformation("HandleRequest: {0} in group {1}, others still buffering, {2} will pause when ready in {3} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupController.cs b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
index 038233fdd..aa8bb9eae 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupController.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
@@ -2,6 +2,7 @@ using System;
 using System.Threading;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.Queue;
 using MediaBrowser.Model.SyncPlay;
 
 namespace MediaBrowser.Controller.SyncPlay
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupState.cs b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
index f6ebe2a58..0028823b4 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
 
 namespace MediaBrowser.Controller.SyncPlay
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
index 2ddaae640..3609be36b 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.Queue;
 using MediaBrowser.Model.SyncPlay;
 
 namespace MediaBrowser.Controller.SyncPlay
@@ -97,13 +98,6 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <returns>The group update.</returns>
         GroupUpdate<T> NewSyncPlayGroupUpdate<T>(GroupUpdateType type, T data);
 
-        /// <summary>
-        /// Converts DateTime to UTC string.
-        /// </summary>
-        /// <param name="dateTime">The date to convert.</param>
-        /// <returns>The UTC string.</returns>
-        string DateToUTCString(DateTime dateTime);
-
         /// <summary>
         /// Sanitizes the PositionTicks, considers the current playing item when available.
         /// </summary>
@@ -187,7 +181,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="newItems">The new items to add to the play queue.</param>
         /// <param name="mode">The mode with which the items will be added.</param>
         /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool AddToPlayQueue(IEnumerable<Guid> newItems, string mode);
+        bool AddToPlayQueue(IEnumerable<Guid> newItems, GroupQueueMode mode);
 
         /// <summary>
         /// Restarts current item in play queue.
@@ -210,13 +204,13 @@ namespace MediaBrowser.Controller.SyncPlay
         /// Sets the repeat mode.
         /// </summary>
         /// <param name="mode">The new mode.</param>
-        void SetRepeatMode(string mode);
+        void SetRepeatMode(GroupRepeatMode mode);
 
         /// <summary>
         /// Sets the shuffle mode.
         /// </summary>
         /// <param name="mode">The new mode.</param>
-        void SetShuffleMode(string mode);
+        void SetShuffleMode(GroupShuffleMode mode);
 
         /// <summary>
         /// Creates a play queue update.
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
index b5bed89f2..a12ab96b7 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class BufferGroupRequest.
@@ -11,28 +11,43 @@ namespace MediaBrowser.Controller.SyncPlay
     public class BufferGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets when the request has been made by the client.
+        /// Initializes a new instance of the <see cref="BufferGroupRequest"/> class.
+        /// </summary>
+        /// <param name="when">When the request has been made, as reported by the client.</param>
+        /// <param name="positionTicks">The position ticks.</param>
+        /// <param name="isPlaying">Whether the client playback is unpaused.</param>
+        /// <param name="playlistItemId">The playlist item identifier of the playing item.</param>
+        public BufferGroupRequest(DateTime when, long positionTicks, bool isPlaying, string playlistItemId)
+        {
+            When = when;
+            PositionTicks = positionTicks;
+            IsPlaying = isPlaying;
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets when the request has been made by the client.
         /// </summary>
         /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
+        public DateTime When { get; }
 
         /// <summary>
-        /// Gets or sets the position ticks.
+        /// Gets the position ticks.
         /// </summary>
         /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
+        public long PositionTicks { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// Gets a value indicating whether the client playback is unpaused.
         /// </summary>
         /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
+        public bool IsPlaying { get; }
 
         /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
+        /// Gets the playlist item identifier of the playing item.
         /// </summary>
         /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Buffer;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
index 325839f10..25034cb10 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class IgnoreWaitGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class IgnoreWaitGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets a value indicating whether the client should be ignored.
+        /// Initializes a new instance of the <see cref="IgnoreWaitGroupRequest"/> class.
+        /// </summary>
+        /// <param name="ignoreWait">Whether the client should be ignored.</param>
+        public IgnoreWaitGroupRequest(bool ignoreWait)
+        {
+            IgnoreWait = ignoreWait;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the client should be ignored.
         /// </summary>
         /// <value>The client group-wait status.</value>
-        public bool IgnoreWait { get; set; }
+        public bool IgnoreWait { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.IgnoreWait;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
index 3c95f53d4..a12eff8b8 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class MovePlaylistItemGroupRequest.
@@ -10,16 +10,27 @@ namespace MediaBrowser.Controller.SyncPlay
     public class MovePlaylistItemGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the playlist identifier of the item.
+        /// Initializes a new instance of the <see cref="MovePlaylistItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist identifier of the item.</param>
+        /// <param name="newIndex">The new position.</param>
+        public MovePlaylistItemGroupRequest(string playlistItemId, int newIndex)
+        {
+            PlaylistItemId = playlistItemId;
+            NewIndex = newIndex;
+        }
+
+        /// <summary>
+        /// Gets the playlist identifier of the item.
         /// </summary>
         /// <value>The playlist identifier of the item.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <summary>
-        /// Gets or sets the new position.
+        /// Gets the new position.
         /// </summary>
         /// <value>The new position.</value>
-        public int NewIndex { get; set; }
+        public int NewIndex { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.MovePlaylistItem;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
index 8636d6f4d..f87bbc556 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class NextTrackGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class NextTrackGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the playing item identifier.
+        /// Initializes a new instance of the <see cref="NextTrackGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public NextTrackGroupRequest(string playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
         /// </summary>
         /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.NextTrack;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
index 45bd3b15f..0dcd1423f 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class PauseGroupRequest.
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
index 9dacb7985..2528bb3e7 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class PingGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class PingGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the ping time.
+        /// Initializes a new instance of the <see cref="PingGroupRequest"/> class.
+        /// </summary>
+        /// <param name="ping">The ping time.</param>
+        public PingGroupRequest(long ping)
+        {
+            Ping = ping;
+        }
+
+        /// <summary>
+        /// Gets the ping time.
         /// </summary>
         /// <value>The ping time.</value>
-        public long Ping { get; set; }
+        public long Ping { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Ping;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
index e090a882e..306c161ed 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -4,30 +4,45 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class PlayGroupRequest.
     /// </summary>
     public class PlayGroupRequest : IGroupPlaybackRequest
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playingQueue">The playing queue.</param>
+        /// <param name="playingItemPosition">The playing item position.</param>
+        /// <param name="startPositionTicks">The start position ticks.</param>
+        public PlayGroupRequest(Guid[] playingQueue, int playingItemPosition, long startPositionTicks)
+        {
+            var list = new List<Guid>();
+            list.AddRange(playingQueue);
+            PlayingQueue = list;
+            PlayingItemPosition = playingItemPosition;
+            StartPositionTicks = startPositionTicks;
+        }
+
         /// <summary>
         /// Gets the playing queue.
         /// </summary>
         /// <value>The playing queue.</value>
-        public List<Guid> PlayingQueue { get; } = new List<Guid>();
+        public IReadOnlyList<Guid> PlayingQueue { get; }
 
         /// <summary>
-        /// Gets or sets the playing item from the queue.
+        /// Gets the position of the playing item in the queue.
         /// </summary>
-        /// <value>The playing item.</value>
-        public int PlayingItemPosition { get; set; }
+        /// <value>The playing item position.</value>
+        public int PlayingItemPosition { get; }
 
         /// <summary>
-        /// Gets or sets the start position ticks.
+        /// Gets the start position ticks.
         /// </summary>
         /// <value>The start position ticks.</value>
-        public long StartPositionTicks { get; set; }
+        public long StartPositionTicks { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Play;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
index aca5d678e..206fef331 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class PreviousTrackGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class PreviousTrackGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the playing item identifier.
+        /// Initializes a new instance of the <see cref="PreviousTrackGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public PreviousTrackGroupRequest(string playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
         /// </summary>
         /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.PreviousTrack;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
index 82380b209..9580b5315 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class QueueGroupRequest.
@@ -12,16 +12,29 @@ namespace MediaBrowser.Controller.SyncPlay
     public class QueueGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets the items to queue.
+        /// Initializes a new instance of the <see cref="QueueGroupRequest"/> class.
         /// </summary>
-        /// <value>The items to queue.</value>
-        public List<Guid> ItemIds { get; } = new List<Guid>();
+        /// <param name="items">The items to add to the queue.</param>
+        /// <param name="mode">The enqueue mode.</param>
+        public QueueGroupRequest(Guid[] items, GroupQueueMode mode)
+        {
+            var list = new List<Guid>();
+            list.AddRange(items);
+            ItemIds = list;
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the items to enqueue.
+        /// </summary>
+        /// <value>The items to enqueue.</value>
+        public IReadOnlyList<Guid> ItemIds { get; }
 
         /// <summary>
-        /// Gets or sets the mode in which to add the new items.
+        /// Gets the mode in which to add the new items.
         /// </summary>
-        /// <value>The mode.</value>
-        public string Mode { get; set; }
+        /// <value>The enqueue mode.</value>
+        public GroupQueueMode Mode { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Queue;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
index c8a2268cf..a2b3553ce 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class ReadyGroupRequest.
@@ -11,28 +11,43 @@ namespace MediaBrowser.Controller.SyncPlay
     public class ReadyGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets when the request has been made by the client.
+        /// Initializes a new instance of the <see cref="ReadyGroupRequest"/> class.
+        /// </summary>
+        /// <param name="when">When the request has been made, as reported by the client.</param>
+        /// <param name="positionTicks">The position ticks.</param>
+        /// <param name="isPlaying">Whether the client playback is unpaused.</param>
+        /// <param name="playlistItemId">The playlist item identifier of the playing item.</param>
+        public ReadyGroupRequest(DateTime when, long positionTicks, bool isPlaying, string playlistItemId)
+        {
+            When = when;
+            PositionTicks = positionTicks;
+            IsPlaying = isPlaying;
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets when the request has been made by the client.
         /// </summary>
         /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
+        public DateTime When { get; }
 
         /// <summary>
-        /// Gets or sets the position ticks.
+        /// Gets the position ticks.
         /// </summary>
         /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
+        public long PositionTicks { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// Gets a value indicating whether the client playback is unpaused.
         /// </summary>
         /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
+        public bool IsPlaying { get; }
 
         /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
+        /// Gets the playlist item identifier of the playing item.
         /// </summary>
         /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Ready;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
index 4ead1301b..21c602846 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -3,18 +3,29 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class RemoveFromPlaylistGroupRequest.
     /// </summary>
     public class RemoveFromPlaylistGroupRequest : IGroupPlaybackRequest
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveFromPlaylistGroupRequest"/> class.
+        /// </summary>
+        /// <param name="items">The playlist ids of the items to remove.</param>
+        public RemoveFromPlaylistGroupRequest(string[] items)
+        {
+            var list = new List<string>();
+            list.AddRange(items);
+            PlaylistItemIds = list;
+        }
+
         /// <summary>
         /// Gets the playlist identifiers ot the items.
         /// </summary>
         /// <value>The playlist identifiers ot the items.</value>
-        public List<string> PlaylistItemIds { get; } = new List<string>();
+        public IReadOnlyList<string> PlaylistItemIds { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.RemoveFromPlaylist;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
index d311bffdc..f7bfc1978 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class SeekGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class SeekGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the position ticks.
+        /// Initializes a new instance of the <see cref="SeekGroupRequest"/> class.
+        /// </summary>
+        /// <param name="positionTicks">The position ticks.</param>
+        public SeekGroupRequest(long positionTicks)
+        {
+            PositionTicks = positionTicks;
+        }
+
+        /// <summary>
+        /// Gets the position ticks.
         /// </summary>
         /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
+        public long PositionTicks { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.Seek;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
index 0983d9129..2ca33c1cc 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class SetPlaylistItemGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class SetPlaylistItemGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the playlist identifier of the playing item.
+        /// Initializes a new instance of the <see cref="SetPlaylistItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist identifier of the item.</param>
+        public SetPlaylistItemGroupRequest(string playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playlist identifier of the playing item.
         /// </summary>
         /// <value>The playlist identifier of the playing item.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.SetPlaylistItem;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
index 79373ef5f..cd4505e4d 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class SetRepeatModeGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class SetRepeatModeGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the repeat mode.
+        /// Initializes a new instance of the <see cref="SetRepeatModeGroupRequest"/> class.
+        /// </summary>
+        /// <param name="mode">The repeat mode.</param>
+        public SetRepeatModeGroupRequest(GroupRepeatMode mode)
+        {
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the repeat mode.
         /// </summary>
         /// <value>The repeat mode.</value>
-        public string Mode { get; set; }
+        public GroupRepeatMode Mode { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.SetRepeatMode;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
index 316fb49f4..4530a34c0 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class SetShuffleModeGroupRequest.
@@ -10,10 +10,19 @@ namespace MediaBrowser.Controller.SyncPlay
     public class SetShuffleModeGroupRequest : IGroupPlaybackRequest
     {
         /// <summary>
-        /// Gets or sets the shuffle mode.
+        /// Initializes a new instance of the <see cref="SetShuffleModeGroupRequest"/> class.
+        /// </summary>
+        /// <param name="mode">The shuffle mode.</param>
+        public SetShuffleModeGroupRequest(GroupShuffleMode mode)
+        {
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the shuffle mode.
         /// </summary>
         /// <value>The shuffle mode.</value>
-        public string Mode { get; set; }
+        public GroupShuffleMode Mode { get; }
 
         /// <inheritdoc />
         public PlaybackRequestType Type { get; } = PlaybackRequestType.SetShuffleMode;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
index 9f6f8ea63..ec01cd110 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class StopGroupRequest.
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
index 84a6b0a6e..bdf4fd476 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
 {
     /// <summary>
     /// Class UnpauseGroupRequest.
diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
index 821a6314b..2d1d1533b 100644
--- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.SyncPlay;
 
-namespace MediaBrowser.Controller.SyncPlay
+namespace MediaBrowser.Controller.SyncPlay.Queue
 {
     /// <summary>
     /// Class PlayQueueManager.
@@ -563,11 +563,8 @@ namespace MediaBrowser.Controller.SyncPlay
             var list = new List<QueueItem>();
             foreach (var item in items)
             {
-                list.Add(new QueueItem()
-                {
-                    ItemId = item,
-                    PlaylistItemId = "syncPlayItem" + GetNextProgressiveId()
-                });
+                var queueItem = new QueueItem(item, "syncPlayItem" + GetNextProgressiveId());
+                list.Add(queueItem);
             }
 
             return list;
diff --git a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
index 85b9a3522..16a75eb68 100644
--- a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.SyncPlay
@@ -9,6 +8,16 @@ namespace MediaBrowser.Model.SyncPlay
     /// </summary>
     public class GroupInfoDto
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GroupInfoDto"/> class.
+        /// </summary>
+        public GroupInfoDto()
+        {
+            GroupId = string.Empty;
+            GroupName = string.Empty;
+            Participants = new List<string>();
+        }
+
         /// <summary>
         /// Gets or sets the group identifier.
         /// </summary>
@@ -37,6 +46,6 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the date when this dto has been updated.
         /// </summary>
         /// <value>The date when this dto has been updated.</value>
-        public string LastUpdatedAt { get; set; }
+        public DateTime LastUpdatedAt { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/GroupQueueMode.cs b/MediaBrowser.Model/SyncPlay/GroupQueueMode.cs
new file mode 100644
index 000000000..5c9c2627b
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/GroupQueueMode.cs
@@ -0,0 +1,18 @@
+namespace MediaBrowser.Model.SyncPlay
+{
+    /// <summary>
+    /// Enum GroupQueueMode.
+    /// </summary>
+    public enum GroupQueueMode
+    {
+        /// <summary>
+        /// Insert items at the end of the queue.
+        /// </summary>
+        Queue = 0,
+
+        /// <summary>
+        /// Insert items after the currently playing item.
+        /// </summary>
+        QueueNext = 1
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/GroupRequestType.cs b/MediaBrowser.Model/SyncPlay/GroupRequestType.cs
index e7361817c..75c071236 100644
--- a/MediaBrowser.Model/SyncPlay/GroupRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupRequestType.cs
@@ -8,26 +8,26 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// A user is requesting to create a new group.
         /// </summary>
-        NewGroup,
+        NewGroup = 0,
 
         /// <summary>
         /// A user is requesting to join a group.
         /// </summary>
-        JoinGroup,
+        JoinGroup = 1,
 
         /// <summary>
         /// A user is requesting to leave a group.
         /// </summary>
-        LeaveGroup,
+        LeaveGroup = 2,
 
         /// <summary>
         /// A user is requesting the list of available groups.
         /// </summary>
-        ListGroups,
+        ListGroups = 3,
 
         /// <summary>
         /// A user is sending a playback command to a group.
         /// </summary>
-        Playback
+        Playback = 4
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/GroupStateType.cs b/MediaBrowser.Model/SyncPlay/GroupStateType.cs
index 341859b30..7aa454f92 100644
--- a/MediaBrowser.Model/SyncPlay/GroupStateType.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupStateType.cs
@@ -8,21 +8,21 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// The group is in idle state. No media is playing.
         /// </summary>
-        Idle,
+        Idle = 0,
 
         /// <summary>
         /// The group is in wating state. Playback is paused. Will start playing when users are ready.
         /// </summary>
-        Waiting,
+        Waiting = 1,
 
         /// <summary>
         /// The group is in paused state. Playback is paused. Will resume on play command.
         /// </summary>
-        Paused,
+        Paused = 2,
 
         /// <summary>
         /// The group is in playing state. Playback is advancing.
         /// </summary>
-        Playing
+        Playing = 3
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs b/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
index ccab5313f..eb61a68d1 100644
--- a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
+++ b/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>
@@ -7,6 +5,14 @@ namespace MediaBrowser.Model.SyncPlay
     /// </summary>
     public class NewGroupRequest
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NewGroupRequest"/> class.
+        /// </summary>
+        public NewGroupRequest()
+        {
+            GroupName = string.Empty;
+        }
+
         /// <summary>
         /// Gets or sets the group name.
         /// </summary>
diff --git a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
index 575597e62..d193b4c66 100644
--- a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.SyncPlay
@@ -9,6 +8,14 @@ namespace MediaBrowser.Model.SyncPlay
     /// </summary>
     public class PlayQueueUpdate
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayQueueUpdate"/> class.
+        /// </summary>
+        public PlayQueueUpdate()
+        {
+            Playlist = new List<QueueItem>();
+        }
+
         /// <summary>
         /// Gets or sets the request type that originated this update.
         /// </summary>
@@ -19,7 +26,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the UTC time of the last change to the playing queue.
         /// </summary>
         /// <value>The UTC time of the last change to the playing queue.</value>
-        public string LastUpdate { get; set; }
+        public DateTime LastUpdate { get; set; }
 
         /// <summary>
         /// Gets or sets the playlist.
diff --git a/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs b/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
index 4b3f6eb4d..e78940fe6 100644
--- a/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
+++ b/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
@@ -26,12 +26,12 @@ namespace MediaBrowser.Model.SyncPlay
         MoveItem = 3,
 
         /// <summary>
-        /// A user is making changes to the queue.
+        /// A user is adding items the queue.
         /// </summary>
         Queue = 4,
 
         /// <summary>
-        /// A user is making changes to the queue.
+        /// A user is adding items to the queue, after the currently playing item.
         /// </summary>
         QueueNext = 5,
 
diff --git a/MediaBrowser.Model/SyncPlay/QueueItem.cs b/MediaBrowser.Model/SyncPlay/QueueItem.cs
index ce253b182..9c4d3a4ce 100644
--- a/MediaBrowser.Model/SyncPlay/QueueItem.cs
+++ b/MediaBrowser.Model/SyncPlay/QueueItem.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace MediaBrowser.Model.SyncPlay
@@ -10,15 +8,26 @@ namespace MediaBrowser.Model.SyncPlay
     public class QueueItem
     {
         /// <summary>
-        /// Gets or sets the item identifier.
+        /// Initializes a new instance of the <see cref="QueueItem"/> class.
+        /// </summary>
+        /// <param name="itemId">The item identifier.</param>
+        /// <param name="playlistItemId">The playlist identifier of the item.</param>
+        public QueueItem(Guid itemId, string playlistItemId)
+        {
+            ItemId = itemId;
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the item identifier.
         /// </summary>
         /// <value>The item identifier.</value>
-        public Guid ItemId { get; set; }
+        public Guid ItemId { get; }
 
         /// <summary>
-        /// Gets or sets the playlist identifier of the item.
+        /// Gets the playlist identifier of the item.
         /// </summary>
         /// <value>The playlist identifier of the item.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/SendCommand.cs b/MediaBrowser.Model/SyncPlay/SendCommand.cs
index b24f7e97b..a3aa54b38 100644
--- a/MediaBrowser.Model/SyncPlay/SendCommand.cs
+++ b/MediaBrowser.Model/SyncPlay/SendCommand.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System;
 
 namespace MediaBrowser.Model.SyncPlay
 {
@@ -7,6 +7,15 @@ namespace MediaBrowser.Model.SyncPlay
     /// </summary>
     public class SendCommand
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SendCommand"/> class.
+        /// </summary>
+        public SendCommand()
+        {
+            GroupId = string.Empty;
+            PlaylistItemId = string.Empty;
+        }
+
         /// <summary>
         /// Gets or sets the group identifier.
         /// </summary>
@@ -23,7 +32,7 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the UTC time when to execute the command.
         /// </summary>
         /// <value>The UTC time when to execute the command.</value>
-        public string When { get; set; }
+        public DateTime When { get; set; }
 
         /// <summary>
         /// Gets or sets the position ticks.
@@ -41,6 +50,6 @@ namespace MediaBrowser.Model.SyncPlay
         /// Gets or sets the UTC time when this command has been emitted.
         /// </summary>
         /// <value>The UTC time when this command has been emitted.</value>
-        public string EmittedAt { get; set; }
+        public DateTime EmittedAt { get; set; }
     }
 }
-- 
cgit v1.2.3


From c7e53bce2fa43ad38807a0589e1bc020237e49c6 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Sun, 15 Nov 2020 17:03:27 +0100
Subject: Patch data-races and minor changes in SyncPlay

---
 .../SyncPlay/GroupController.cs                    |  96 +++----
 .../SyncPlay/SyncPlayManager.cs                    | 312 ++++++++++-----------
 Jellyfin.Api/Controllers/SyncPlayController.cs     |  16 +-
 Jellyfin.Api/Controllers/TimeSyncController.cs     |  14 +-
 .../SyncPlay/GroupStates/AbstractGroupState.cs     |  14 +-
 .../SyncPlay/GroupStates/WaitingGroupState.cs      |  46 +--
 .../SyncPlay/IGroupStateContext.cs                 |   6 +-
 .../SyncPlay/ISyncPlayManager.cs                   |  16 --
 .../SyncPlay/PlaybackRequests/PlayGroupRequest.cs  |   4 +-
 .../SyncPlay/PlaybackRequests/QueueGroupRequest.cs |   4 +-
 .../RemoveFromPlaylistGroupRequest.cs              |   5 +-
 .../SyncPlay/Queue/PlayQueueManager.cs             |  22 +-
 MediaBrowser.Model/SyncPlay/GroupInfoDto.cs        |  37 ++-
 MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs    |  19 +-
 MediaBrowser.Model/SyncPlay/GroupUpdate.cs         |  29 +-
 MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs    |  13 +-
 MediaBrowser.Model/SyncPlay/NewGroupRequest.cs     |   9 +-
 MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs     |  45 +--
 MediaBrowser.Model/SyncPlay/SendCommand.cs         |  36 ++-
 MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs     |  21 +-
 20 files changed, 381 insertions(+), 383 deletions(-)

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs
index a0d951b3e..48596bb42 100644
--- a/Emby.Server.Implementations/SyncPlay/GroupController.cs
+++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs
@@ -45,11 +45,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        /// <summary>
-        /// The SyncPlay manager.
-        /// </summary>
-        private readonly ISyncPlayManager _syncPlayManager;
-
         /// <summary>
         /// Internal group state.
         /// </summary>
@@ -63,19 +58,16 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <param name="userManager">The user manager.</param>
         /// <param name="sessionManager">The session manager.</param>
         /// <param name="libraryManager">The library manager.</param>
-        /// <param name="syncPlayManager">The SyncPlay manager.</param>
         public GroupController(
             ILogger logger,
             IUserManager userManager,
             ISessionManager sessionManager,
-            ILibraryManager libraryManager,
-            ISyncPlayManager syncPlayManager)
+            ILibraryManager libraryManager)
         {
             _logger = logger;
             _userManager = userManager;
             _sessionManager = sessionManager;
             _libraryManager = libraryManager;
-            _syncPlayManager = syncPlayManager;
 
             _state = new IdleGroupState(_logger);
         }
@@ -168,7 +160,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// </summary>
         /// <param name="from">The current session.</param>
         /// <param name="type">The filtering type.</param>
-        /// <returns>The array of sessions matching the filter.</returns>
+        /// <returns>The list of sessions matching the filter.</returns>
         private IEnumerable<SessionInfo> FilterSessions(SessionInfo from, SyncPlayBroadcastType type)
         {
             return type switch
@@ -209,7 +201,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <param name="user">The user.</param>
         /// <param name="queue">The queue.</param>
         /// <returns><c>true</c> if the user can access all the items in the queue, <c>false</c> otherwise.</returns>
-        private bool HasAccessToQueue(User user, IEnumerable<Guid> queue)
+        private bool HasAccessToQueue(User user, IReadOnlyList<Guid> queue)
         {
             // Check if queue is empty.
             if (!queue?.Any() ?? true)
@@ -234,7 +226,7 @@ namespace Emby.Server.Implementations.SyncPlay
             return true;
         }
 
-        private bool AllUsersHaveAccessToQueue(IEnumerable<Guid> queue)
+        private bool AllUsersHaveAccessToQueue(IReadOnlyList<Guid> queue)
         {
             // Check if queue is empty.
             if (!queue?.Any() ?? true)
@@ -262,7 +254,6 @@ namespace Emby.Server.Implementations.SyncPlay
         {
             GroupName = request.GroupName;
             AddSession(session);
-            _syncPlayManager.AddSessionToGroup(session, this);
 
             var sessionIsPlayingAnItem = session.FullNowPlayingItem != null;
 
@@ -270,7 +261,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             if (sessionIsPlayingAnItem)
             {
-                var playlist = session.NowPlayingQueue.Select(item => item.Id);
+                var playlist = session.NowPlayingQueue.Select(item => item.Id).ToList();
                 PlayQueue.Reset();
                 PlayQueue.SetPlaylist(playlist);
                 PlayQueue.SetPlayingItemById(session.FullNowPlayingItem.Id);
@@ -290,14 +281,13 @@ namespace Emby.Server.Implementations.SyncPlay
 
             _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("InitGroup: {0} created group {1}.", session.Id, GroupId.ToString());
+            _logger.LogInformation("InitGroup: {SessionId} created group {GroupId}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
         public void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
         {
             AddSession(session);
-            _syncPlayManager.AddSessionToGroup(session, this);
 
             var updateSession = NewSyncPlayGroupUpdate(GroupUpdateType.GroupJoined, GetInfo());
             SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
@@ -307,7 +297,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("SessionJoin: {0} joined group {1}.", session.Id, GroupId.ToString());
+            _logger.LogInformation("SessionJoin: {SessionId} joined group {GroupId}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
@@ -321,7 +311,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             _state.SessionJoined(this, _state.Type, session, cancellationToken);
 
-            _logger.LogInformation("SessionRestore: {0} re-joined group {1}.", session.Id, GroupId.ToString());
+            _logger.LogInformation("SessionRestore: {SessionId} re-joined group {GroupId}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
@@ -330,7 +320,6 @@ namespace Emby.Server.Implementations.SyncPlay
             _state.SessionLeaving(this, _state.Type, session, cancellationToken);
 
             RemoveSession(session);
-            _syncPlayManager.RemoveSessionFromGroup(session, this);
 
             var updateSession = NewSyncPlayGroupUpdate(GroupUpdateType.GroupLeft, GroupId.ToString());
             SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
@@ -338,7 +327,7 @@ namespace Emby.Server.Implementations.SyncPlay
             var updateOthers = NewSyncPlayGroupUpdate(GroupUpdateType.UserLeft, session.UserName);
             SendGroupUpdate(session, SyncPlayBroadcastType.AllExceptCurrentSession, updateOthers, cancellationToken);
 
-            _logger.LogInformation("SessionLeave: {0} left group {1}.", session.Id, GroupId.ToString());
+            _logger.LogInformation("SessionLeave: {SessionId} left group {GroupId}.", session.Id, GroupId.ToString());
         }
 
         /// <inheritdoc />
@@ -347,27 +336,21 @@ namespace Emby.Server.Implementations.SyncPlay
             // The server's job is to maintain a consistent state for clients to reference
             // and notify clients of state changes. The actual syncing of media playback
             // happens client side. Clients are aware of the server's time and use it to sync.
-            _logger.LogInformation("HandleRequest: {0} requested {1}, group {2} in {3} state.", session.Id, request.Type, GroupId.ToString(), _state.Type);
+            _logger.LogInformation("HandleRequest: {SessionId} requested {RequestType}, group {GroupId} is {StateType}.", session.Id, request.Type, GroupId.ToString(), _state.Type);
             request.Apply(this, _state, session, cancellationToken);
         }
 
         /// <inheritdoc />
         public GroupInfoDto GetInfo()
         {
-            return new GroupInfoDto()
-            {
-                GroupId = GroupId.ToString(),
-                GroupName = GroupName,
-                State = _state.Type,
-                Participants = Participants.Values.Select(session => session.Session.UserName).Distinct().ToList(),
-                LastUpdatedAt = DateTime.UtcNow
-            };
+            var participants = Participants.Values.Select(session => session.Session.UserName).Distinct().ToList();
+            return new GroupInfoDto(GroupId, GroupName, _state.Type, participants, DateTime.UtcNow);
         }
 
         /// <inheritdoc />
         public bool HasAccessToPlayQueue(User user)
         {
-            var items = PlayQueue.GetPlaylist().Select(item => item.ItemId);
+            var items = PlayQueue.GetPlaylist().Select(item => item.ItemId).ToList();
             return HasAccessToQueue(user, items);
         }
 
@@ -383,7 +366,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void SetState(IGroupState state)
         {
-            _logger.LogInformation("SetState: {0} switching from {1} to {2}.", GroupId.ToString(), _state.Type, state.Type);
+            _logger.LogInformation("SetState: {GroupId} switching from {FromStateType} to {ToStateType}.", GroupId.ToString(), _state.Type, state.Type);
             this._state = state;
         }
 
@@ -418,26 +401,19 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public SendCommand NewSyncPlayCommand(SendCommandType type)
         {
-            return new SendCommand()
-            {
-                GroupId = GroupId.ToString(),
-                PlaylistItemId = PlayQueue.GetPlayingItemPlaylistId(),
-                PositionTicks = PositionTicks,
-                Command = type,
-                When = LastActivity,
-                EmittedAt = DateTime.UtcNow
-            };
+            return new SendCommand(
+                GroupId,
+                PlayQueue.GetPlayingItemPlaylistId(),
+                LastActivity,
+                type,
+                PositionTicks,
+                DateTime.UtcNow);
         }
 
         /// <inheritdoc />
         public GroupUpdate<T> NewSyncPlayGroupUpdate<T>(GroupUpdateType type, T data)
         {
-            return new GroupUpdate<T>()
-            {
-                GroupId = GroupId.ToString(),
-                Type = type,
-                Data = data
-            };
+            return new GroupUpdate<T>(GroupId, type, data);
         }
 
         /// <inheritdoc />
@@ -501,10 +477,10 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool SetPlayQueue(IEnumerable<Guid> playQueue, int playingItemPosition, long startPositionTicks)
+        public bool SetPlayQueue(IReadOnlyList<Guid> playQueue, int playingItemPosition, long startPositionTicks)
         {
             // Ignore on empty queue or invalid item position.
-            if (!playQueue.Any() || playingItemPosition >= playQueue.Count() || playingItemPosition < 0)
+            if (playQueue.Count == 0 || playingItemPosition >= playQueue.Count || playingItemPosition < 0)
             {
                 return false;
             }
@@ -547,7 +523,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool RemoveFromPlayQueue(IEnumerable<string> playlistItemIds)
+        public bool RemoveFromPlayQueue(IReadOnlyList<string> playlistItemIds)
         {
             var playingItemRemoved = PlayQueue.RemoveFromPlaylist(playlistItemIds);
             if (playingItemRemoved)
@@ -576,10 +552,10 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public bool AddToPlayQueue(IEnumerable<Guid> newItems, GroupQueueMode mode)
+        public bool AddToPlayQueue(IReadOnlyList<Guid> newItems, GroupQueueMode mode)
         {
             // Ignore on empty list.
-            if (!newItems.Any())
+            if (newItems.Count == 0)
             {
                 return false;
             }
@@ -673,16 +649,14 @@ namespace Emby.Server.Implementations.SyncPlay
                 startPositionTicks += Math.Max(elapsedTime.Ticks, 0);
             }
 
-            return new PlayQueueUpdate()
-            {
-                Reason = reason,
-                LastUpdate = PlayQueue.LastChange,
-                Playlist = PlayQueue.GetPlaylist(),
-                PlayingItemIndex = PlayQueue.PlayingItemIndex,
-                StartPositionTicks = startPositionTicks,
-                ShuffleMode = PlayQueue.ShuffleMode,
-                RepeatMode = PlayQueue.RepeatMode
-            };
+            return new PlayQueueUpdate(
+                reason,
+                PlayQueue.LastChange,
+                PlayQueue.GetPlaylist(),
+                PlayQueue.PlayingItemIndex,
+                startPositionTicks,
+                PlayQueue.ShuffleMode,
+                PlayQueue.RepeatMode);
         }
     }
 }
diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index 178536631..ee75580cc 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -72,19 +72,9 @@ namespace Emby.Server.Implementations.SyncPlay
             _userManager = userManager;
             _sessionManager = sessionManager;
             _libraryManager = libraryManager;
-
             _sessionManager.SessionStarted += OnSessionManagerSessionStarted;
-            _sessionManager.SessionEnded += OnSessionManagerSessionEnded;
-            _sessionManager.PlaybackStart += OnSessionManagerPlaybackStart;
-            _sessionManager.PlaybackStopped += OnSessionManagerPlaybackStopped;
         }
 
-        /// <summary>
-        /// Gets all groups.
-        /// </summary>
-        /// <value>All groups.</value>
-        public IEnumerable<IGroupController> Groups => _groups.Values;
-
         /// <inheritdoc />
         public void Dispose()
         {
@@ -92,127 +82,6 @@ namespace Emby.Server.Implementations.SyncPlay
             GC.SuppressFinalize(this);
         }
 
-        /// <summary>
-        /// Releases unmanaged and optionally managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _sessionManager.SessionStarted -= OnSessionManagerSessionStarted;
-            _sessionManager.SessionEnded -= OnSessionManagerSessionEnded;
-            _sessionManager.PlaybackStart -= OnSessionManagerPlaybackStart;
-            _sessionManager.PlaybackStopped -= OnSessionManagerPlaybackStopped;
-
-            _disposed = true;
-        }
-
-        private void OnSessionManagerSessionStarted(object sender, SessionEventArgs e)
-        {
-            var session = e.SessionInfo;
-            if (!IsSessionInGroup(session))
-            {
-                return;
-            }
-
-            var groupId = GetSessionGroup(session) ?? Guid.Empty;
-            var request = new JoinGroupRequest()
-            {
-                GroupId = groupId
-            };
-            JoinGroup(session, groupId, request, CancellationToken.None);
-        }
-
-        private void OnSessionManagerSessionEnded(object sender, SessionEventArgs e)
-        {
-            var session = e.SessionInfo;
-            if (!IsSessionInGroup(session))
-            {
-                return;
-            }
-
-            // TODO: probably remove this event, not used at the moment.
-        }
-
-        private void OnSessionManagerPlaybackStart(object sender, PlaybackProgressEventArgs e)
-        {
-            var session = e.Session;
-            if (!IsSessionInGroup(session))
-            {
-                return;
-            }
-
-            // TODO: probably remove this event, not used at the moment.
-        }
-
-        private void OnSessionManagerPlaybackStopped(object sender, PlaybackStopEventArgs e)
-        {
-            var session = e.Session;
-            if (!IsSessionInGroup(session))
-            {
-                return;
-            }
-
-            // TODO: probably remove this event, not used at the moment.
-        }
-
-        private bool IsRequestValid<T>(SessionInfo session, GroupRequestType requestType, T request, bool checkRequest = true)
-        {
-            if (session == null || (request == null && checkRequest))
-            {
-                return false;
-            }
-
-            var user = _userManager.GetUserById(session.UserId);
-
-            if (user.SyncPlayAccess == SyncPlayAccess.None)
-            {
-                _logger.LogWarning("IsRequestValid: {0} does not have access to SyncPlay. Requested {1}.", session.Id, requestType);
-
-                var error = new GroupUpdate<string>()
-                {
-                    // TODO: rename to a more generic error. Next PR will fix this.
-                    Type = GroupUpdateType.JoinGroupDenied
-                };
-                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
-                return false;
-            }
-
-            if (requestType.Equals(GroupRequestType.NewGroup) && user.SyncPlayAccess != SyncPlayAccess.CreateAndJoinGroups)
-            {
-                _logger.LogWarning("IsRequestValid: {0} does not have permission to create groups.", session.Id);
-
-                var error = new GroupUpdate<string>
-                {
-                    Type = GroupUpdateType.CreateGroupDenied
-                };
-                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool IsRequestValid(SessionInfo session, GroupRequestType requestType)
-        {
-            return IsRequestValid(session, requestType, session, false);
-        }
-
-        private bool IsSessionInGroup(SessionInfo session)
-        {
-            return _sessionToGroupMap.ContainsKey(session.Id);
-        }
-
-        private Guid? GetSessionGroup(SessionInfo session)
-        {
-            _sessionToGroupMap.TryGetValue(session.Id, out var group);
-            return group?.GroupId;
-        }
-
         /// <inheritdoc />
         public void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
         {
@@ -229,9 +98,10 @@ namespace Emby.Server.Implementations.SyncPlay
                     LeaveGroup(session, cancellationToken);
                 }
 
-                var group = new GroupController(_logger, _userManager, _sessionManager, _libraryManager, this);
+                var group = new GroupController(_logger, _userManager, _sessionManager, _libraryManager);
                 _groups[group.GroupId] = group;
 
+                AddSessionToGroup(session, group);
                 group.CreateGroup(session, request, cancellationToken);
             }
         }
@@ -253,25 +123,18 @@ namespace Emby.Server.Implementations.SyncPlay
 
                 if (group == null)
                 {
-                    _logger.LogWarning("JoinGroup: {0} tried to join group {0} that does not exist.", session.Id, groupId);
+                    _logger.LogWarning("JoinGroup: {SessionId} tried to join group {GroupId} that does not exist.", session.Id, groupId);
 
-                    var error = new GroupUpdate<string>()
-                    {
-                        Type = GroupUpdateType.GroupDoesNotExist
-                    };
+                    var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.GroupDoesNotExist, string.Empty);
                     _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
                     return;
                 }
 
                 if (!group.HasAccessToPlayQueue(user))
                 {
-                    _logger.LogWarning("JoinGroup: {0} does not have access to some content from the playing queue of group {1}.", session.Id, group.GroupId.ToString());
+                    _logger.LogWarning("JoinGroup: {SessionId} does not have access to some content from the playing queue of group {GroupId}.", session.Id, group.GroupId.ToString());
 
-                    var error = new GroupUpdate<string>()
-                    {
-                        GroupId = group.GroupId.ToString(),
-                        Type = GroupUpdateType.LibraryAccessDenied
-                    };
+                    var error = new GroupUpdate<string>(group.GroupId, GroupUpdateType.LibraryAccessDenied, string.Empty);
                     _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
                     return;
                 }
@@ -287,6 +150,7 @@ namespace Emby.Server.Implementations.SyncPlay
                     LeaveGroup(session, cancellationToken);
                 }
 
+                AddSessionToGroup(session, group);
                 group.SessionJoin(session, request, cancellationToken);
             }
         }
@@ -307,21 +171,19 @@ namespace Emby.Server.Implementations.SyncPlay
 
                 if (group == null)
                 {
-                    _logger.LogWarning("LeaveGroup: {0} does not belong to any group.", session.Id);
+                    _logger.LogWarning("LeaveGroup: {SessionId} does not belong to any group.", session.Id);
 
-                    var error = new GroupUpdate<string>()
-                    {
-                        Type = GroupUpdateType.NotInGroup
-                    };
+                    var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty);
                     _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
                     return;
                 }
 
+                RemoveSessionFromGroup(session, group);
                 group.SessionLeave(session, cancellationToken);
 
                 if (group.IsGroupEmpty())
                 {
-                    _logger.LogInformation("LeaveGroup: removing empty group {0}.", group.GroupId);
+                    _logger.LogInformation("LeaveGroup: removing empty group {GroupId}.", group.GroupId);
                     _groups.Remove(group.GroupId, out _);
                 }
             }
@@ -338,11 +200,14 @@ namespace Emby.Server.Implementations.SyncPlay
 
             var user = _userManager.GetUserById(session.UserId);
 
-            return _groups
-                .Values
-                .Where(group => group.HasAccessToPlayQueue(user))
-                .Select(group => group.GetInfo())
-                .ToList();
+            lock (_groupsLock)
+            {
+                return _groups
+                    .Values
+                    .Where(group => group.HasAccessToPlayQueue(user))
+                    .Select(group => group.GetInfo())
+                    .ToList();
+            }
         }
 
         /// <inheritdoc />
@@ -360,12 +225,9 @@ namespace Emby.Server.Implementations.SyncPlay
 
                 if (group == null)
                 {
-                    _logger.LogWarning("HandleRequest: {0} does not belong to any group.", session.Id);
+                    _logger.LogWarning("HandleRequest: {SessionId} does not belong to any group.", session.Id);
 
-                    var error = new GroupUpdate<string>()
-                    {
-                        Type = GroupUpdateType.NotInGroup
-                    };
+                    var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty);
                     _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
                     return;
                 }
@@ -374,8 +236,74 @@ namespace Emby.Server.Implementations.SyncPlay
             }
         }
 
-        /// <inheritdoc />
-        public void AddSessionToGroup(SessionInfo session, IGroupController group)
+        /// <summary>
+        /// Releases unmanaged and optionally managed resources.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            _sessionManager.SessionStarted -= OnSessionManagerSessionStarted;
+            _disposed = true;
+        }
+
+        private void OnSessionManagerSessionStarted(object sender, SessionEventArgs e)
+        {
+            var session = e.SessionInfo;
+            lock (_groupsLock)
+            {
+                if (!IsSessionInGroup(session))
+                {
+                    return;
+                }
+
+                var groupId = GetSessionGroup(session);
+                var request = new JoinGroupRequest(groupId);
+                JoinGroup(session, groupId, request, CancellationToken.None);
+            }
+        }
+
+        /// <summary>
+        /// Checks if a given session has joined a group.
+        /// </summary>
+        /// <remarks>
+        /// Not thread-safe, call only under groups-lock.
+        /// </remarks>
+        /// <param name="session">The session.</param>
+        /// <returns><c>true</c> if the session has joined a group, <c>false</c> otherwise.</returns>
+        private bool IsSessionInGroup(SessionInfo session)
+        {
+            return _sessionToGroupMap.ContainsKey(session.Id);
+        }
+
+        /// <summary>
+        /// Gets the group joined by the given session, if any.
+        /// </summary>
+        /// <remarks>
+        /// Not thread-safe, call only under groups-lock.
+        /// </remarks>
+        /// <param name="session">The session.</param>
+        /// <returns>The group identifier if the session has joined a group, an empty identifier otherwise.</returns>
+        private Guid GetSessionGroup(SessionInfo session)
+        {
+            _sessionToGroupMap.TryGetValue(session.Id, out var group);
+            return group?.GroupId ?? Guid.Empty;
+        }
+
+        /// <summary>
+        /// Maps a session to a group.
+        /// </summary>
+        /// <remarks>
+        /// Not thread-safe, call only under groups-lock.
+        /// </remarks>
+        /// <param name="session">The session.</param>
+        /// <param name="group">The group.</param>
+        /// <exception cref="InvalidOperationException">Thrown when the user is in another group already.</exception>
+        private void AddSessionToGroup(SessionInfo session, IGroupController group)
         {
             if (session == null)
             {
@@ -390,8 +318,16 @@ namespace Emby.Server.Implementations.SyncPlay
             _sessionToGroupMap[session.Id] = group ?? throw new InvalidOperationException("Group is null!");
         }
 
-        /// <inheritdoc />
-        public void RemoveSessionFromGroup(SessionInfo session, IGroupController group)
+        /// <summary>
+        /// Unmaps a session from a group.
+        /// </summary>
+        /// <remarks>
+        /// Not thread-safe, call only under groups-lock.
+        /// </remarks>
+        /// <param name="session">The session.</param>
+        /// <param name="group">The group.</param>
+        /// <exception cref="InvalidOperationException">Thrown when the user is not found in the specified group.</exception>
+        private void RemoveSessionFromGroup(SessionInfo session, IGroupController group)
         {
             if (session == null)
             {
@@ -414,5 +350,55 @@ namespace Emby.Server.Implementations.SyncPlay
                 throw new InvalidOperationException("Session was in wrong group!");
             }
         }
+
+        /// <summary>
+        /// Checks if a given session is allowed to make a given request.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="requestType">The request type.</param>
+        /// <param name="request">The request.</param>
+        /// <param name="checkRequest">Whether to check if request is null.</param>
+        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session is null.</returns>
+        private bool IsRequestValid<T>(SessionInfo session, GroupRequestType requestType, T request, bool checkRequest = true)
+        {
+            if (session == null || (request == null && checkRequest))
+            {
+                return false;
+            }
+
+            var user = _userManager.GetUserById(session.UserId);
+
+            if (user.SyncPlayAccess == SyncPlayAccess.None)
+            {
+                _logger.LogWarning("IsRequestValid: {SessionId} does not have access to SyncPlay. Requested {RequestType}.", session.Id, requestType);
+
+                // TODO: rename to a more generic error. Next PR will fix this.
+                var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.JoinGroupDenied, string.Empty);
+                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
+                return false;
+            }
+
+            if (requestType.Equals(GroupRequestType.NewGroup) && user.SyncPlayAccess != SyncPlayAccess.CreateAndJoinGroups)
+            {
+                _logger.LogWarning("IsRequestValid: {SessionId} does not have permission to create groups.", session.Id);
+
+                var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.CreateGroupDenied, string.Empty);
+                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if a given session is allowed to make a given type of request.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="requestType">The request type.</param>
+        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session is null.</returns>
+        private bool IsRequestValid(SessionInfo session, GroupRequestType requestType)
+        {
+            return IsRequestValid(session, requestType, session, false);
+        }
     }
 }
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 9085a71c8..8e9314b4a 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -53,10 +53,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string groupName)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var newGroupRequest = new NewGroupRequest()
-            {
-                GroupName = groupName
-            };
+            var newGroupRequest = new NewGroupRequest(groupName);
             _syncPlayManager.NewGroup(currentSession, newGroupRequest, CancellationToken.None);
             return NoContent();
         }
@@ -73,10 +70,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] Guid groupId)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var joinRequest = new JoinGroupRequest()
-            {
-                GroupId = groupId
-            };
+            var joinRequest = new JoinGroupRequest(groupId);
             _syncPlayManager.JoinGroup(currentSession, groupId, joinRequest, CancellationToken.None);
             return NoContent();
         }
@@ -185,18 +179,18 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to queue items to the playlist of a SyncPlay group.
         /// </summary>
-        /// <param name="items">The items to add.</param>
+        /// <param name="itemIds">The items to add.</param>
         /// <param name="mode">The mode in which to enqueue the items.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayQueue(
-            [FromQuery, Required] Guid[] items,
+            [FromQuery, Required] Guid[] itemIds,
             [FromQuery, Required] GroupQueueMode mode)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new QueueGroupRequest(items, mode);
+            var syncPlayRequest = new QueueGroupRequest(itemIds, mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
diff --git a/Jellyfin.Api/Controllers/TimeSyncController.cs b/Jellyfin.Api/Controllers/TimeSyncController.cs
index 2dc744e7c..5de560417 100644
--- a/Jellyfin.Api/Controllers/TimeSyncController.cs
+++ b/Jellyfin.Api/Controllers/TimeSyncController.cs
@@ -13,7 +13,7 @@ namespace Jellyfin.Api.Controllers
     public class TimeSyncController : BaseJellyfinApiController
     {
         /// <summary>
-        /// Gets the current utc time.
+        /// Gets the current UTC time.
         /// </summary>
         /// <response code="200">Time returned.</response>
         /// <returns>An <see cref="UtcTimeResponse"/> to sync the client and server time.</returns>
@@ -22,18 +22,14 @@ namespace Jellyfin.Api.Controllers
         public ActionResult<UtcTimeResponse> GetUtcTime()
         {
             // Important to keep the following line at the beginning
-            var requestReceptionTime = DateTime.UtcNow.ToUniversalTime().ToString("o", DateTimeFormatInfo.InvariantInfo);
+            var requestReceptionTime = DateTime.UtcNow.ToUniversalTime();
 
-            var response = new UtcTimeResponse();
-            response.RequestReceptionTime = requestReceptionTime;
-
-            // Important to keep the following two lines at the end
-            var responseTransmissionTime = DateTime.UtcNow.ToUniversalTime().ToString("o", DateTimeFormatInfo.InvariantInfo);
-            response.ResponseTransmissionTime = responseTransmissionTime;
+            // Important to keep the following line at the end
+            var responseTransmissionTime = DateTime.UtcNow.ToUniversalTime();
 
             // Implementing NTP on such a high level results in this useless
             // information being sent. On the other hand it enables future additions.
-            return response;
+            return new UtcTimeResponse(requestReceptionTime, responseTransmissionTime);
         }
     }
 }
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
index bc2e22380..e5da0ef40 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
@@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
             if (playingItemRemoved && !context.PlayQueue.IsItemPlaying())
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, play queue is empty.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, play queue is empty.", request.Type, context.GroupId.ToString());
 
                 IGroupState idleState = new IdleGroupState(Logger);
                 context.SetState(idleState);
@@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
             if (!result)
             {
-                Logger.LogError("HandleRequest: {0} in group {1}, unable to move item in play queue.", request.Type, context.GroupId.ToString());
+                Logger.LogError("HandleRequest: {RequestType} in group {GroupId}, unable to move item in play queue.", request.Type, context.GroupId.ToString());
                 return;
             }
 
@@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
             if (!result)
             {
-                Logger.LogError("HandleRequest: {0} in group {1}, unable to add items to play queue.", request.Type, context.GroupId.ToString());
+                Logger.LogError("HandleRequest: {RequestType} in group {GroupId}, unable to add items to play queue.", request.Type, context.GroupId.ToString());
                 return;
             }
 
@@ -203,18 +203,14 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         protected void SendGroupStateUpdate(IGroupStateContext context, IGroupPlaybackRequest reason, SessionInfo session, CancellationToken cancellationToken)
         {
             // Notify relevant state change event.
-            var stateUpdate = new GroupStateUpdate()
-            {
-                State = Type,
-                Reason = reason.Type
-            };
+            var stateUpdate = new GroupStateUpdate(Type, reason.Type);
             var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.StateUpdate, stateUpdate);
             context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
         }
 
         private void UnhandledRequest(IGroupPlaybackRequest request)
         {
-            Logger.LogWarning("HandleRequest: unhandled {0} request for {1} state.", request.Type, Type);
+            Logger.LogWarning("HandleRequest: unhandled {RequestType} request in {StateType} state.", request.Type, Type);
         }
     }
 }
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
index 78318dd94..e33e711fb 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
@@ -103,7 +103,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                     var unpauseRequest = new UnpauseGroupRequest();
                     playingState.HandleRequest(context, Type, unpauseRequest, session, cancellationToken);
 
-                    Logger.LogDebug("SessionLeaving: {0} left the group {1}, notifying others to resume.", session.Id, context.GroupId.ToString());
+                    Logger.LogDebug("SessionLeaving: {SessionId} left group {GroupId}, notifying others to resume.", session.Id, context.GroupId.ToString());
                 }
                 else
                 {
@@ -111,7 +111,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                     var pausedState = new PausedGroupState(Logger);
                     context.SetState(pausedState);
 
-                    Logger.LogDebug("SessionLeaving: {0} left the group {1}, returning to previous state.", session.Id, context.GroupId.ToString());
+                    Logger.LogDebug("SessionLeaving: {SessionId} left group {GroupId}, returning to previous state.", session.Id, context.GroupId.ToString());
                 }
             }
         }
@@ -131,7 +131,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             var setQueueStatus = context.SetPlayQueue(request.PlayingQueue, request.PlayingItemPosition, request.StartPositionTicks);
             if (!setQueueStatus)
             {
-                Logger.LogError("HandleRequest: {0} in group {1}, unable to set playing queue.", request.Type, context.GroupId.ToString());
+                Logger.LogError("HandleRequest: {RequestType} in group {GroupId}, unable to set playing queue.", request.Type, context.GroupId.ToString());
 
                 // Ignore request and return to previous state.
                 IGroupState newState = prevState switch {
@@ -151,7 +151,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             // Reset status of sessions and await for all Ready events.
             context.SetAllBuffering(true);
 
-            Logger.LogDebug("HandleRequest: {0} in group {1}, {2} set a new play queue.", request.Type, context.GroupId.ToString(), session.Id);
+            Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} set a new play queue.", request.Type, context.GroupId.ToString(), session.Id);
         }
 
         /// <inheritdoc />
@@ -188,7 +188,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                 context.SetState(newState);
 
-                Logger.LogDebug("HandleRequest: {0} in group {1}, unable to change current playing item.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, unable to change current playing item.", request.Type, context.GroupId.ToString());
             }
         }
 
@@ -214,13 +214,13 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                 // Reset status of sessions and await for all Ready events.
                 context.SetAllBuffering(true);
 
-                Logger.LogDebug("HandleRequest: {0} in group {1}, waiting for all ready events.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, waiting for all ready events.", request.Type, context.GroupId.ToString());
             }
             else
             {
                 if (ResumePlaying)
                 {
-                    Logger.LogDebug("HandleRequest: {0} in group {1}, ignoring sessions that are not ready and forcing the playback to start.", request.Type, context.GroupId.ToString());
+                    Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, ignoring sessions that are not ready and forcing the playback to start.", request.Type, context.GroupId.ToString());
 
                     // An Unpause request is forcing the playback to start, ignoring sessions that are not ready.
                     context.SetAllBuffering(false);
@@ -326,7 +326,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             // Make sure the client is playing the correct item.
             if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
 
                 var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
                 var updateSession = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
@@ -400,7 +400,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             // Make sure the client is playing the correct item.
             if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, {2} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} has wrong playlist item.", request.Type, context.GroupId.ToString(), session.Id);
 
                 var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.SetCurrentItem);
                 var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
@@ -420,7 +420,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             var timeSyncThresholdTicks = TimeSpan.FromMilliseconds(context.TimeSyncOffset).Ticks;
             if (Math.Abs(elapsedTime.Ticks) > timeSyncThresholdTicks)
             {
-                Logger.LogWarning("HandleRequest: {0} in group {1}, {2} is not time syncing properly. Ignoring elapsed time.", request.Type, context.GroupId.ToString(), session.Id);
+                Logger.LogWarning("HandleRequest: {RequestType} in group {GroupId}, {SessionId} is not time syncing properly. Ignoring elapsed time.", request.Type, context.GroupId.ToString(), session.Id);
 
                 elapsedTime = TimeSpan.Zero;
             }
@@ -436,7 +436,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             var delayTicks = context.PositionTicks - clientPosition.Ticks;
             var maxPlaybackOffsetTicks = TimeSpan.FromMilliseconds(context.MaxPlaybackOffset).Ticks;
 
-            Logger.LogDebug("HandleRequest: {0} in group {1}, {2} at {3} (delay of {4} seconds).", request.Type, context.GroupId.ToString(), session.Id, clientPosition, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+            Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} at {PositionTicks} (delay of {Delay} seconds).", request.Type, context.GroupId.ToString(), session.Id, clientPosition, TimeSpan.FromTicks(delayTicks).TotalSeconds);
 
             if (ResumePlaying)
             {
@@ -454,7 +454,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                     // Notify relevant state change event.
                     SendGroupStateUpdate(context, request, session, cancellationToken);
 
-                    Logger.LogWarning("HandleRequest: {0} in group {1}, {2} got lost in time, correcting.", request.Type, context.GroupId.ToString(), session.Id);
+                    Logger.LogWarning("HandleRequest: {RequestType} in group {GroupId}, {SessionId} got lost in time, correcting.", request.Type, context.GroupId.ToString(), session.Id);
                     return;
                 }
 
@@ -468,7 +468,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                     command.When = currentTime.AddTicks(delayTicks);
                     context.SendCommand(session, SyncPlayBroadcastType.CurrentSession, command, cancellationToken);
 
-                    Logger.LogInformation("HandleRequest: {0} in group {1}, others still buffering, {2} will pause when ready in {3} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                    Logger.LogInformation("HandleRequest: {RequestType} in group {GroupId}, others still buffering, {SessionId} will pause when ready in {Delay} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
                 }
                 else
                 {
@@ -487,7 +487,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                         context.SendCommand(session, filter, command, cancellationToken);
 
-                        Logger.LogInformation("HandleRequest: {0} in group {1}, {2} is recovering, notifying others to resume in {3} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                        Logger.LogInformation("HandleRequest: {RequestType} in group {GroupId}, {SessionId} is recovering, notifying others to resume in {Delay} seconds.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
                     }
                     else
                     {
@@ -500,7 +500,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                         var command = context.NewSyncPlayCommand(SendCommandType.Unpause);
                         context.SendCommand(session, SyncPlayBroadcastType.AllGroup, command, cancellationToken);
 
-                        Logger.LogWarning("HandleRequest: {0} in group {1}, {2} resumed playback but did not update others in time. {3} seconds to recover.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
+                        Logger.LogWarning("HandleRequest: {RequestType} in group {GroupId}, {SessionId} resumed playback but did not update others in time. {Delay} seconds to recover.", request.Type, context.GroupId.ToString(), session.Id, TimeSpan.FromTicks(delayTicks).TotalSeconds);
                     }
 
                     // Change state.
@@ -511,7 +511,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             }
             else
             {
-                // Check that session is really ready, tollerate player imperfections under a certain threshold.
+                // Check that session is really ready, tolerate player imperfections under a certain threshold.
                 if (Math.Abs(context.PositionTicks - requestTicks) > maxPlaybackOffsetTicks)
                 {
                     // Session still not ready.
@@ -523,7 +523,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                     // Notify relevant state change event.
                     SendGroupStateUpdate(context, request, session, cancellationToken);
 
-                    Logger.LogWarning("HandleRequest: {0} in group {1}, {2} was seeking to wrong position, correcting.", request.Type, context.GroupId.ToString(), session.Id);
+                    Logger.LogWarning("HandleRequest: {RequestType} in group {GroupId}, {SessionId} is seeking to wrong position, correcting.", request.Type, context.GroupId.ToString(), session.Id);
                     return;
                 }
                 else
@@ -549,7 +549,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
                         pausedState.HandleRequest(context, Type, request, session, cancellationToken);
                     }
 
-                    Logger.LogDebug("HandleRequest: {0} in group {1}, {2} is ready, returning to previous state.", request.Type, context.GroupId.ToString(), session.Id);
+                    Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} is ready, returning to previous state.", request.Type, context.GroupId.ToString(), session.Id);
                 }
             }
         }
@@ -569,7 +569,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             // Make sure the client knows the playing item, to avoid duplicate requests.
             if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} provided the wrong playlist identifier.", request.Type, context.GroupId.ToString(), session.Id);
                 return;
             }
 
@@ -596,7 +596,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                 context.SetState(newState);
 
-                Logger.LogDebug("HandleRequest: {0} in group {1}, no next track available.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, no next track available.", request.Type, context.GroupId.ToString());
             }
         }
 
@@ -615,7 +615,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             // Make sure the client knows the playing item, to avoid duplicate requests.
             if (!request.PlaylistItemId.Equals(context.PlayQueue.GetPlayingItemPlaylistId(), StringComparison.OrdinalIgnoreCase))
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, client provided the wrong playlist identifier.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, {SessionId} provided the wrong playlist identifier.", request.Type, context.GroupId.ToString(), session.Id);
                 return;
             }
 
@@ -642,7 +642,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                 context.SetState(newState);
 
-                Logger.LogDebug("HandleRequest: {0} in group {1}, no previous track available.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, no previous track available.", request.Type, context.GroupId.ToString());
             }
         }
 
@@ -653,7 +653,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
             if (!context.IsBuffering())
             {
-                Logger.LogDebug("HandleRequest: {0} in group {1}, returning to previous state.", request.Type, context.GroupId.ToString());
+                Logger.LogDebug("HandleRequest: {RequestType} in group {GroupId}, returning to previous state.", request.Type, context.GroupId.ToString());
 
                 if (ResumePlaying)
                 {
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
index 3609be36b..13f1b2316 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupStateContext.cs
@@ -151,7 +151,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="playingItemPosition">The playing item position in the play queue.</param>
         /// <param name="startPositionTicks">The start position ticks.</param>
         /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool SetPlayQueue(IEnumerable<Guid> playQueue, int playingItemPosition, long startPositionTicks);
+        bool SetPlayQueue(IReadOnlyList<Guid> playQueue, int playingItemPosition, long startPositionTicks);
 
         /// <summary>
         /// Sets the playing item.
@@ -165,7 +165,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// </summary>
         /// <param name="playlistItemIds">The items to remove.</param>
         /// <returns><c>true</c> if playing item got removed; <c>false</c> otherwise.</returns>
-        bool RemoveFromPlayQueue(IEnumerable<string> playlistItemIds);
+        bool RemoveFromPlayQueue(IReadOnlyList<string> playlistItemIds);
 
         /// <summary>
         /// Moves an item in the play queue.
@@ -181,7 +181,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="newItems">The new items to add to the play queue.</param>
         /// <param name="mode">The mode with which the items will be added.</param>
         /// <returns><c>true</c> if the play queue has been changed; <c>false</c> if something went wrong.</returns>
-        bool AddToPlayQueue(IEnumerable<Guid> newItems, GroupQueueMode mode);
+        bool AddToPlayQueue(IReadOnlyList<Guid> newItems, GroupQueueMode mode);
 
         /// <summary>
         /// Restarts current item in play queue.
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index 65146d4ae..a98001682 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -49,21 +49,5 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Maps a session to a group.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="group">The group.</param>
-        /// <exception cref="InvalidOperationException">Thrown when the user is in another group already.</exception>
-        void AddSessionToGroup(SessionInfo session, IGroupController group);
-
-        /// <summary>
-        /// Unmaps a session from a group.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="group">The group.</param>
-        /// <exception cref="InvalidOperationException">Thrown when the user is not found in the specified group.</exception>
-        void RemoveSessionFromGroup(SessionInfo session, IGroupController group);
     }
 }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
index 306c161ed..7d27f6151 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -19,9 +19,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// <param name="startPositionTicks">The start position ticks.</param>
         public PlayGroupRequest(Guid[] playingQueue, int playingItemPosition, long startPositionTicks)
         {
-            var list = new List<Guid>();
-            list.AddRange(playingQueue);
-            PlayingQueue = list;
+            PlayingQueue = playingQueue ?? Array.Empty<Guid>();
             PlayingItemPosition = playingItemPosition;
             StartPositionTicks = startPositionTicks;
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
index 9580b5315..106daecc8 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -18,9 +18,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// <param name="mode">The enqueue mode.</param>
         public QueueGroupRequest(Guid[] items, GroupQueueMode mode)
         {
-            var list = new List<Guid>();
-            list.AddRange(items);
-            ItemIds = list;
+            ItemIds = items ?? Array.Empty<Guid>();
             Mode = mode;
         }
 
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
index 21c602846..1e892d819 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using MediaBrowser.Controller.Session;
@@ -16,9 +17,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// <param name="items">The playlist ids of the items to remove.</param>
         public RemoveFromPlaylistGroupRequest(string[] items)
         {
-            var list = new List<string>();
-            list.AddRange(items);
-            PlaylistItemIds = list;
+            PlaylistItemIds = items ?? Array.Empty<string>();
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
index 2d1d1533b..73457f447 100644
--- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
@@ -94,7 +94,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// Sets a new playlist. Playing item is reset.
         /// </summary>
         /// <param name="items">The new items of the playlist.</param>
-        public void SetPlaylist(IEnumerable<Guid> items)
+        public void SetPlaylist(IReadOnlyList<Guid> items)
         {
             SortedPlaylist.Clear();
             ShuffledPlaylist.Clear();
@@ -114,7 +114,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// Appends new items to the playlist. The specified order is mantained.
         /// </summary>
         /// <param name="items">The items to add to the playlist.</param>
-        public void Queue(IEnumerable<Guid> items)
+        public void Queue(IReadOnlyList<Guid> items)
         {
             var newItems = CreateQueueItemsFromArray(items);
 
@@ -209,7 +209,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// Adds new items to the playlist right after the playing item. The specified order is mantained.
         /// </summary>
         /// <param name="items">The items to add to the playlist.</param>
-        public void QueueNext(IEnumerable<Guid> items)
+        public void QueueNext(IReadOnlyList<Guid> items)
         {
             var newItems = CreateQueueItemsFromArray(items);
 
@@ -312,13 +312,12 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// </summary>
         /// <param name="playlistItemIds">The items to remove.</param>
         /// <returns><c>true</c> if playing item got removed; <c>false</c> otherwise.</returns>
-        public bool RemoveFromPlaylist(IEnumerable<string> playlistItemIds)
+        public bool RemoveFromPlaylist(IReadOnlyList<string> playlistItemIds)
         {
             var playingItem = GetPlayingItem();
-            var playlistItemIdsList = playlistItemIds.ToList();
 
-            SortedPlaylist.RemoveAll(item => playlistItemIdsList.Contains(item.PlaylistItemId));
-            ShuffledPlaylist.RemoveAll(item => playlistItemIdsList.Contains(item.PlaylistItemId));
+            SortedPlaylist.RemoveAll(item => playlistItemIds.Contains(item.PlaylistItemId));
+            ShuffledPlaylist.RemoveAll(item => playlistItemIds.Contains(item.PlaylistItemId));
 
             LastChange = DateTime.UtcNow;
 
@@ -369,8 +368,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
 
             var queueItem = playlist[oldIndex];
             playlist.RemoveAt(oldIndex);
-            newIndex = Math.Min(newIndex, playlist.Count);
-            newIndex = Math.Max(newIndex, 0);
+            newIndex = Math.Clamp(newIndex, 0, playlist.Count);
             playlist.Insert(newIndex, queueItem);
 
             LastChange = DateTime.UtcNow;
@@ -489,7 +487,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
                 }
                 else
                 {
-                    PlayingItemIndex--;
+                    PlayingItemIndex = SortedPlaylist.Count - 1;
                     return false;
                 }
             }
@@ -519,7 +517,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
                 }
                 else
                 {
-                    PlayingItemIndex++;
+                    PlayingItemIndex = 0;
                     return false;
                 }
             }
@@ -558,7 +556,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// Creates a list from the array of items. Each item is given an unique playlist identifier.
         /// </summary>
         /// <returns>The list of queue items.</returns>
-        private List<QueueItem> CreateQueueItemsFromArray(IEnumerable<Guid> items)
+        private List<QueueItem> CreateQueueItemsFromArray(IReadOnlyList<Guid> items)
         {
             var list = new List<QueueItem>();
             foreach (var item in items)
diff --git a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
index 16a75eb68..8c0960b83 100644
--- a/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupInfoDto.cs
@@ -11,41 +11,48 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// Initializes a new instance of the <see cref="GroupInfoDto"/> class.
         /// </summary>
-        public GroupInfoDto()
+        /// <param name="groupId">The group identifier.</param>
+        /// <param name="groupName">The group name.</param>
+        /// <param name="state">The group state.</param>
+        /// <param name="participants">The participants.</param>
+        /// <param name="lastUpdatedAt">The date when this DTO has been created.</param>
+        public GroupInfoDto(Guid groupId, string groupName, GroupStateType state, IReadOnlyList<string> participants, DateTime lastUpdatedAt)
         {
-            GroupId = string.Empty;
-            GroupName = string.Empty;
-            Participants = new List<string>();
+            GroupId = groupId;
+            GroupName = groupName;
+            State = state;
+            Participants = participants;
+            LastUpdatedAt = lastUpdatedAt;
         }
 
         /// <summary>
-        /// Gets or sets the group identifier.
+        /// Gets the group identifier.
         /// </summary>
         /// <value>The group identifier.</value>
-        public string GroupId { get; set; }
+        public Guid GroupId { get; }
 
         /// <summary>
-        /// Gets or sets the group name.
+        /// Gets the group name.
         /// </summary>
         /// <value>The group name.</value>
-        public string GroupName { get; set; }
+        public string GroupName { get; }
 
         /// <summary>
-        /// Gets or sets the group state.
+        /// Gets the group state.
         /// </summary>
         /// <value>The group state.</value>
-        public GroupStateType State { get; set; }
+        public GroupStateType State { get; }
 
         /// <summary>
-        /// Gets or sets the participants.
+        /// Gets the participants.
         /// </summary>
         /// <value>The participants.</value>
-        public IReadOnlyList<string> Participants { get; set; }
+        public IReadOnlyList<string> Participants { get; }
 
         /// <summary>
-        /// Gets or sets the date when this dto has been updated.
+        /// Gets the date when this DTO has been created.
         /// </summary>
-        /// <value>The date when this dto has been updated.</value>
-        public DateTime LastUpdatedAt { get; set; }
+        /// <value>The date when this DTO has been created.</value>
+        public DateTime LastUpdatedAt { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs b/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
index 532b5a56f..7f7deb86b 100644
--- a/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupStateUpdate.cs
@@ -6,15 +6,26 @@ namespace MediaBrowser.Model.SyncPlay
     public class GroupStateUpdate
     {
         /// <summary>
-        /// Gets or sets the state of the group.
+        /// Initializes a new instance of the <see cref="GroupStateUpdate"/> class.
+        /// </summary>
+        /// <param name="state">The state of the group.</param>
+        /// <param name="reason">The reason of the state change.</param>
+        public GroupStateUpdate(GroupStateType state, PlaybackRequestType reason)
+        {
+            State = state;
+            Reason = reason;
+        }
+
+        /// <summary>
+        /// Gets the state of the group.
         /// </summary>
         /// <value>The state of the group.</value>
-        public GroupStateType State { get; set; }
+        public GroupStateType State { get; }
 
         /// <summary>
-        /// Gets or sets the reason of the state change.
+        /// Gets the reason of the state change.
         /// </summary>
         /// <value>The reason of the state change.</value>
-        public PlaybackRequestType Reason { get; set; }
+        public PlaybackRequestType Reason { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
index 12d6058ac..6f159d653 100644
--- a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System;
 
 namespace MediaBrowser.Model.SyncPlay
 {
@@ -9,21 +9,34 @@ namespace MediaBrowser.Model.SyncPlay
     public class GroupUpdate<T>
     {
         /// <summary>
-        /// Gets or sets the group identifier.
+        /// Initializes a new instance of the <see cref="GroupUpdate{T}"/> class.
+        /// </summary>
+        /// <param name="groupId">The group identifier.</param>
+        /// <param name="type">The update type.</param>
+        /// <param name="data">The update data.</param>
+        public GroupUpdate(Guid groupId, GroupUpdateType type, T data)
+        {
+            GroupId = groupId;
+            Type = type;
+            Data = data;
+        }
+
+        /// <summary>
+        /// Gets the group identifier.
         /// </summary>
         /// <value>The group identifier.</value>
-        public string GroupId { get; set; }
+        public Guid GroupId { get; }
 
         /// <summary>
-        /// Gets or sets the update type.
+        /// Gets the update type.
         /// </summary>
         /// <value>The update type.</value>
-        public GroupUpdateType Type { get; set; }
+        public GroupUpdateType Type { get; }
 
         /// <summary>
-        /// Gets or sets the data.
+        /// Gets the update data.
         /// </summary>
-        /// <value>The data.</value>
-        public T Data { get; set; }
+        /// <value>The update data.</value>
+        public T Data { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs b/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
index 27a29b899..7402c4ce2 100644
--- a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
+++ b/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
@@ -8,9 +8,18 @@ namespace MediaBrowser.Model.SyncPlay
     public class JoinGroupRequest
     {
         /// <summary>
-        /// Gets or sets the group identifier.
+        /// Initializes a new instance of the <see cref="JoinGroupRequest"/> class.
+        /// </summary>
+        /// <param name="groupId">The identifier of the group to join.</param>
+        public JoinGroupRequest(Guid groupId)
+        {
+            GroupId = groupId;
+        }
+
+        /// <summary>
+        /// Gets the group identifier.
         /// </summary>
         /// <value>The identifier of the group to join.</value>
-        public Guid GroupId { get; set; }
+        public Guid GroupId { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs b/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
index eb61a68d1..ba4bd3ef1 100644
--- a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
+++ b/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
@@ -8,15 +8,16 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// Initializes a new instance of the <see cref="NewGroupRequest"/> class.
         /// </summary>
-        public NewGroupRequest()
+        /// <param name="groupName">The name of the new group.</param>
+        public NewGroupRequest(string groupName)
         {
-            GroupName = string.Empty;
+            GroupName = groupName;
         }
 
         /// <summary>
-        /// Gets or sets the group name.
+        /// Gets the group name.
         /// </summary>
         /// <value>The name of the new group.</value>
-        public string GroupName { get; set; }
+        public string GroupName { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
index d193b4c66..a851229f7 100644
--- a/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
+++ b/MediaBrowser.Model/SyncPlay/PlayQueueUpdate.cs
@@ -11,51 +11,64 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// Initializes a new instance of the <see cref="PlayQueueUpdate"/> class.
         /// </summary>
-        public PlayQueueUpdate()
+        /// <param name="reason">The reason for the update.</param>
+        /// <param name="lastUpdate">The UTC time of the last change to the playing queue.</param>
+        /// <param name="playlist">The playlist.</param>
+        /// <param name="playingItemIndex">The playing item index in the playlist.</param>
+        /// <param name="startPositionTicks">The start position ticks.</param>
+        /// <param name="shuffleMode">The shuffle mode.</param>
+        /// <param name="repeatMode">The repeat mode.</param>
+        public PlayQueueUpdate(PlayQueueUpdateReason reason, DateTime lastUpdate, IReadOnlyList<QueueItem> playlist, int playingItemIndex, long startPositionTicks, GroupShuffleMode shuffleMode, GroupRepeatMode repeatMode)
         {
-            Playlist = new List<QueueItem>();
+            Reason = reason;
+            LastUpdate = lastUpdate;
+            Playlist = playlist;
+            PlayingItemIndex = playingItemIndex;
+            StartPositionTicks = startPositionTicks;
+            ShuffleMode = shuffleMode;
+            RepeatMode = repeatMode;
         }
 
         /// <summary>
-        /// Gets or sets the request type that originated this update.
+        /// Gets the request type that originated this update.
         /// </summary>
         /// <value>The reason for the update.</value>
-        public PlayQueueUpdateReason Reason { get; set; }
+        public PlayQueueUpdateReason Reason { get; }
 
         /// <summary>
-        /// Gets or sets the UTC time of the last change to the playing queue.
+        /// Gets the UTC time of the last change to the playing queue.
         /// </summary>
         /// <value>The UTC time of the last change to the playing queue.</value>
-        public DateTime LastUpdate { get; set; }
+        public DateTime LastUpdate { get; }
 
         /// <summary>
-        /// Gets or sets the playlist.
+        /// Gets the playlist.
         /// </summary>
         /// <value>The playlist.</value>
-        public IReadOnlyList<QueueItem> Playlist { get; set; }
+        public IReadOnlyList<QueueItem> Playlist { get; }
 
         /// <summary>
-        /// Gets or sets the playing item index in the playlist.
+        /// Gets the playing item index in the playlist.
         /// </summary>
         /// <value>The playing item index in the playlist.</value>
-        public int PlayingItemIndex { get; set; }
+        public int PlayingItemIndex { get; }
 
         /// <summary>
-        /// Gets or sets the start position ticks.
+        /// Gets the start position ticks.
         /// </summary>
         /// <value>The start position ticks.</value>
-        public long StartPositionTicks { get; set; }
+        public long StartPositionTicks { get; }
 
         /// <summary>
-        /// Gets or sets the shuffle mode.
+        /// Gets the shuffle mode.
         /// </summary>
         /// <value>The shuffle mode.</value>
-        public GroupShuffleMode ShuffleMode { get; set; }
+        public GroupShuffleMode ShuffleMode { get; }
 
         /// <summary>
-        /// Gets or sets the repeat mode.
+        /// Gets the repeat mode.
         /// </summary>
         /// <value>The repeat mode.</value>
-        public GroupRepeatMode RepeatMode { get; set; }
+        public GroupRepeatMode RepeatMode { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/SendCommand.cs b/MediaBrowser.Model/SyncPlay/SendCommand.cs
index a3aa54b38..ab4c64130 100644
--- a/MediaBrowser.Model/SyncPlay/SendCommand.cs
+++ b/MediaBrowser.Model/SyncPlay/SendCommand.cs
@@ -10,23 +10,33 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// Initializes a new instance of the <see cref="SendCommand"/> class.
         /// </summary>
-        public SendCommand()
+        /// <param name="groupId">The group identifier.</param>
+        /// <param name="playlistItemId">The playlist identifier of the playing item.</param>
+        /// <param name="when">The UTC time when to execute the command.</param>
+        /// <param name="command">The command.</param>
+        /// <param name="positionTicks">The position ticks, for commands that require it.</param>
+        /// <param name="emittedAt">The UTC time when this command has been emitted.</param>
+        public SendCommand(Guid groupId, string playlistItemId, DateTime when, SendCommandType command, long? positionTicks, DateTime emittedAt)
         {
-            GroupId = string.Empty;
-            PlaylistItemId = string.Empty;
+            GroupId = groupId;
+            PlaylistItemId = playlistItemId;
+            When = when;
+            Command = command;
+            PositionTicks = positionTicks;
+            EmittedAt = emittedAt;
         }
 
         /// <summary>
-        /// Gets or sets the group identifier.
+        /// Gets the group identifier.
         /// </summary>
         /// <value>The group identifier.</value>
-        public string GroupId { get; set; }
+        public Guid GroupId { get; }
 
         /// <summary>
-        /// Gets or sets the playlist identifier of the playing item.
+        /// Gets the playlist identifier of the playing item.
         /// </summary>
         /// <value>The playlist identifier of the playing item.</value>
-        public string PlaylistItemId { get; set; }
+        public string PlaylistItemId { get; }
 
         /// <summary>
         /// Gets or sets the UTC time when to execute the command.
@@ -35,21 +45,21 @@ namespace MediaBrowser.Model.SyncPlay
         public DateTime When { get; set; }
 
         /// <summary>
-        /// Gets or sets the position ticks.
+        /// Gets the position ticks.
         /// </summary>
         /// <value>The position ticks.</value>
-        public long? PositionTicks { get; set; }
+        public long? PositionTicks { get; }
 
         /// <summary>
-        /// Gets or sets the command.
+        /// Gets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SendCommandType Command { get; set; }
+        public SendCommandType Command { get; }
 
         /// <summary>
-        /// Gets or sets the UTC time when this command has been emitted.
+        /// Gets the UTC time when this command has been emitted.
         /// </summary>
         /// <value>The UTC time when this command has been emitted.</value>
-        public DateTime EmittedAt { get; set; }
+        public DateTime EmittedAt { get; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs b/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs
index 8ec5eaab3..219e7b1e0 100644
--- a/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs
+++ b/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System;
 
 namespace MediaBrowser.Model.SyncPlay
 {
@@ -8,15 +8,26 @@ namespace MediaBrowser.Model.SyncPlay
     public class UtcTimeResponse
     {
         /// <summary>
-        /// Gets or sets the UTC time when request has been received.
+        /// Initializes a new instance of the <see cref="UtcTimeResponse"/> class.
+        /// </summary>
+        /// <param name="requestReceptionTime">The UTC time when request has been received.</param>
+        /// <param name="responseTransmissionTime">The UTC time when response has been sent.</param>
+        public UtcTimeResponse(DateTime requestReceptionTime, DateTime responseTransmissionTime)
+        {
+            RequestReceptionTime = requestReceptionTime;
+            ResponseTransmissionTime = responseTransmissionTime;
+        }
+
+        /// <summary>
+        /// Gets the UTC time when request has been received.
         /// </summary>
         /// <value>The UTC time when request has been received.</value>
-        public string RequestReceptionTime { get; set; }
+        public DateTime RequestReceptionTime { get; }
 
         /// <summary>
-        /// Gets or sets the UTC time when response has been sent.
+        /// Gets the UTC time when response has been sent.
         /// </summary>
         /// <value>The UTC time when response has been sent.</value>
-        public string ResponseTransmissionTime { get; set; }
+        public DateTime ResponseTransmissionTime { get; }
     }
 }
-- 
cgit v1.2.3


From f5973d57e8c070692450f0e04e01615c78c954d9 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 21 Nov 2020 14:26:03 +0100
Subject: Remove UTF8 bom from some files

---
 Jellyfin.Api/Controllers/ApiKeyController.cs         | 2 +-
 Jellyfin.Api/Controllers/ArtistsController.cs        | 2 +-
 Jellyfin.Api/Controllers/BrandingController.cs       | 2 +-
 Jellyfin.Api/Controllers/CollectionController.cs     | 2 +-
 Jellyfin.Api/Controllers/DashboardController.cs      | 2 +-
 Jellyfin.Api/Controllers/FilterController.cs         | 2 +-
 Jellyfin.Api/Controllers/GenresController.cs         | 2 +-
 Jellyfin.Api/Controllers/HlsSegmentController.cs     | 2 +-
 Jellyfin.Api/Controllers/ImageController.cs          | 2 +-
 Jellyfin.Api/Controllers/InstantMixController.cs     | 2 +-
 Jellyfin.Api/Controllers/ItemLookupController.cs     | 2 +-
 Jellyfin.Api/Controllers/ItemUpdateController.cs     | 2 +-
 Jellyfin.Api/Controllers/LocalizationController.cs   | 2 +-
 Jellyfin.Api/Controllers/MediaInfoController.cs      | 2 +-
 Jellyfin.Api/Controllers/MoviesController.cs         | 2 +-
 Jellyfin.Api/Controllers/MusicGenresController.cs    | 2 +-
 Jellyfin.Api/Controllers/PersonsController.cs        | 2 +-
 Jellyfin.Api/Controllers/PlaylistsController.cs      | 2 +-
 Jellyfin.Api/Controllers/PlaystateController.cs      | 2 +-
 Jellyfin.Api/Controllers/PluginsController.cs        | 2 +-
 Jellyfin.Api/Controllers/StudiosController.cs        | 2 +-
 Jellyfin.Api/Controllers/SuggestionsController.cs    | 2 +-
 Jellyfin.Api/Controllers/SyncPlayController.cs       | 2 +-
 Jellyfin.Api/Controllers/SystemController.cs         | 2 +-
 Jellyfin.Api/Controllers/TimeSyncController.cs       | 2 +-
 Jellyfin.Api/Controllers/UniversalAudioController.cs | 2 +-
 Jellyfin.Api/Controllers/UserController.cs           | 2 +-
 Jellyfin.Api/Controllers/UserViewsController.cs      | 2 +-
 Jellyfin.Api/Controllers/YearsController.cs          | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Jellyfin.Api/Controllers/ApiKeyController.cs b/Jellyfin.Api/Controllers/ApiKeyController.cs
index e8d6ccdf2..8c43d786a 100644
--- a/Jellyfin.Api/Controllers/ApiKeyController.cs
+++ b/Jellyfin.Api/Controllers/ApiKeyController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/ArtistsController.cs b/Jellyfin.Api/Controllers/ArtistsController.cs
index f684c649a..c65dc8620 100644
--- a/Jellyfin.Api/Controllers/ArtistsController.cs
+++ b/Jellyfin.Api/Controllers/ArtistsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/BrandingController.cs b/Jellyfin.Api/Controllers/BrandingController.cs
index 1d4836f27..d3ea41201 100644
--- a/Jellyfin.Api/Controllers/BrandingController.cs
+++ b/Jellyfin.Api/Controllers/BrandingController.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Branding;
 using Microsoft.AspNetCore.Http;
diff --git a/Jellyfin.Api/Controllers/CollectionController.cs b/Jellyfin.Api/Controllers/CollectionController.cs
index 2a342c2cb..2a7b2b5c6 100644
--- a/Jellyfin.Api/Controllers/CollectionController.cs
+++ b/Jellyfin.Api/Controllers/CollectionController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/DashboardController.cs b/Jellyfin.Api/Controllers/DashboardController.cs
index a859ac114..ccc81dfc5 100644
--- a/Jellyfin.Api/Controllers/DashboardController.cs
+++ b/Jellyfin.Api/Controllers/DashboardController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/FilterController.cs b/Jellyfin.Api/Controllers/FilterController.cs
index c97a1ed14..31cb9e273 100644
--- a/Jellyfin.Api/Controllers/FilterController.cs
+++ b/Jellyfin.Api/Controllers/FilterController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.ModelBinders;
diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.cs
index 2dd504770..d2b41e0a8 100644
--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/HlsSegmentController.cs b/Jellyfin.Api/Controllers/HlsSegmentController.cs
index ccdbbb297..f51987732 100644
--- a/Jellyfin.Api/Controllers/HlsSegmentController.cs
+++ b/Jellyfin.Api/Controllers/HlsSegmentController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs
index 366f70163..f48c1df72 100644
--- a/Jellyfin.Api/Controllers/ImageController.cs
+++ b/Jellyfin.Api/Controllers/ImageController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index d17a26db4..6913afd0f 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/ItemLookupController.cs b/Jellyfin.Api/Controllers/ItemLookupController.cs
index a7c1a6388..6c38f77ce 100644
--- a/Jellyfin.Api/Controllers/ItemLookupController.cs
+++ b/Jellyfin.Api/Controllers/ItemLookupController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
diff --git a/Jellyfin.Api/Controllers/ItemUpdateController.cs b/Jellyfin.Api/Controllers/ItemUpdateController.cs
index 0a6ed31ae..9e1a39853 100644
--- a/Jellyfin.Api/Controllers/ItemUpdateController.cs
+++ b/Jellyfin.Api/Controllers/ItemUpdateController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/LocalizationController.cs b/Jellyfin.Api/Controllers/LocalizationController.cs
index ef2e7e8b1..3d8b9e0ca 100644
--- a/Jellyfin.Api/Controllers/LocalizationController.cs
+++ b/Jellyfin.Api/Controllers/LocalizationController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Jellyfin.Api.Constants;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
diff --git a/Jellyfin.Api/Controllers/MediaInfoController.cs b/Jellyfin.Api/Controllers/MediaInfoController.cs
index 186024585..b42e6686e 100644
--- a/Jellyfin.Api/Controllers/MediaInfoController.cs
+++ b/Jellyfin.Api/Controllers/MediaInfoController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Buffers;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index ebc148fe5..75dfd4e68 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/MusicGenresController.cs b/Jellyfin.Api/Controllers/MusicGenresController.cs
index 8c6104302..e7d0a61c5 100644
--- a/Jellyfin.Api/Controllers/MusicGenresController.cs
+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/PersonsController.cs b/Jellyfin.Api/Controllers/PersonsController.cs
index 9dc79b388..aaad36551 100644
--- a/Jellyfin.Api/Controllers/PersonsController.cs
+++ b/Jellyfin.Api/Controllers/PersonsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/PlaylistsController.cs b/Jellyfin.Api/Controllers/PlaylistsController.cs
index bc47ecbd1..3e55434c0 100644
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/Jellyfin.Api/Controllers/PlaystateController.cs b/Jellyfin.Api/Controllers/PlaystateController.cs
index 5c15e9a0d..7a60b0deb 100644
--- a/Jellyfin.Api/Controllers/PlaystateController.cs
+++ b/Jellyfin.Api/Controllers/PlaystateController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
diff --git a/Jellyfin.Api/Controllers/PluginsController.cs b/Jellyfin.Api/Controllers/PluginsController.cs
index 0f8ceba29..98f1bc2d2 100644
--- a/Jellyfin.Api/Controllers/PluginsController.cs
+++ b/Jellyfin.Api/Controllers/PluginsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/StudiosController.cs b/Jellyfin.Api/Controllers/StudiosController.cs
index af28b4f59..5090bf1de 100644
--- a/Jellyfin.Api/Controllers/StudiosController.cs
+++ b/Jellyfin.Api/Controllers/StudiosController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
diff --git a/Jellyfin.Api/Controllers/SuggestionsController.cs b/Jellyfin.Api/Controllers/SuggestionsController.cs
index 69292186e..9f1dec712 100644
--- a/Jellyfin.Api/Controllers/SuggestionsController.cs
+++ b/Jellyfin.Api/Controllers/SuggestionsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index e16a10ba4..346431e60 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading;
diff --git a/Jellyfin.Api/Controllers/SystemController.cs b/Jellyfin.Api/Controllers/SystemController.cs
index 4cb1984a2..92875d735 100644
--- a/Jellyfin.Api/Controllers/SystemController.cs
+++ b/Jellyfin.Api/Controllers/SystemController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
diff --git a/Jellyfin.Api/Controllers/TimeSyncController.cs b/Jellyfin.Api/Controllers/TimeSyncController.cs
index 2dc744e7c..27c7186fc 100644
--- a/Jellyfin.Api/Controllers/TimeSyncController.cs
+++ b/Jellyfin.Api/Controllers/TimeSyncController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.AspNetCore.Http;
diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs
index 255532307..34c9f32fa 100644
--- a/Jellyfin.Api/Controllers/UniversalAudioController.cs
+++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 0f7c25d0e..9805b84b1 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
diff --git a/Jellyfin.Api/Controllers/UserViewsController.cs b/Jellyfin.Api/Controllers/UserViewsController.cs
index 60fd1df01..e1483ce9d 100644
--- a/Jellyfin.Api/Controllers/UserViewsController.cs
+++ b/Jellyfin.Api/Controllers/UserViewsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index 9c3ecb4ce..ec7c3de97 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-- 
cgit v1.2.3


From c60714e36518ab1ea3a2a5b64999d5fb7462460c Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Sat, 28 Nov 2020 14:19:24 +0100
Subject: Move query parameters to request body in SyncPlay

---
 .../SyncPlay/GroupController.cs                    |   7 +-
 .../SyncPlay/SyncPlayManager.cs                    |  11 +-
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 148 +++++++++++----------
 .../SyncPlay/IGroupController.cs                   |   7 +-
 .../SyncPlay/ISyncPlayManager.cs                   |   5 +-
 .../SyncPlay/PlaybackRequests/PlayGroupRequest.cs  |   2 +-
 .../SyncPlay/PlaybackRequests/QueueGroupRequest.cs |   2 +-
 .../RemoveFromPlaylistGroupRequest.cs              |   2 +-
 MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs    |  25 ----
 MediaBrowser.Model/SyncPlay/NewGroupRequest.cs     |  23 ----
 .../SyncPlay/RequestBodies/BufferRequestBody.cs    |  42 ++++++
 .../RequestBodies/IgnoreWaitRequestBody.cs         |  14 ++
 .../SyncPlay/RequestBodies/JoinGroupRequestBody.cs |  16 +++
 .../RequestBodies/MovePlaylistItemRequestBody.cs   |  28 ++++
 .../SyncPlay/RequestBodies/NewGroupRequestBody.cs  |  22 +++
 .../SyncPlay/RequestBodies/NextTrackRequestBody.cs |  22 +++
 .../SyncPlay/RequestBodies/PingRequestBody.cs      |  14 ++
 .../SyncPlay/RequestBodies/PlayRequestBody.cs      |  37 ++++++
 .../RequestBodies/PreviousTrackRequestBody.cs      |  22 +++
 .../SyncPlay/RequestBodies/QueueRequestBody.cs     |  31 +++++
 .../SyncPlay/RequestBodies/ReadyRequestBody.cs     |  42 ++++++
 .../RequestBodies/RemoveFromPlaylistRequestBody.cs |  25 ++++
 .../SyncPlay/RequestBodies/SeekRequestBody.cs      |  14 ++
 .../RequestBodies/SetPlaylistItemRequestBody.cs    |  22 +++
 .../RequestBodies/SetRepeatModeRequestBody.cs      |  14 ++
 .../RequestBodies/SetShuffleModeRequestBody.cs     |  14 ++
 26 files changed, 475 insertions(+), 136 deletions(-)
 delete mode 100644 MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs
index 31df8404b..612fba504 100644
--- a/Emby.Server.Implementations/SyncPlay/GroupController.cs
+++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs
@@ -13,6 +13,7 @@ using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Controller.SyncPlay.GroupStates;
 using MediaBrowser.Controller.SyncPlay.Queue;
 using MediaBrowser.Model.SyncPlay;
+using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.SyncPlay
@@ -256,7 +257,7 @@ namespace Emby.Server.Implementations.SyncPlay
         public bool IsGroupEmpty() => _participants.Count == 0;
 
         /// <inheritdoc />
-        public void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
+        public void CreateGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken)
         {
             GroupName = request.GroupName;
             AddSession(session);
@@ -291,7 +292,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
+        public void SessionJoin(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken)
         {
             AddSession(session);
 
@@ -307,7 +308,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
+        public void SessionRestore(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken)
         {
             var updateSession = NewSyncPlayGroupUpdate(GroupUpdateType.GroupJoined, GetInfo());
             SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index be94c3982..5a0d61926 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Model.SyncPlay;
+using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.SyncPlay
@@ -94,7 +94,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
+        public void NewGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken)
         {
             // TODO: create abstract class for GroupRequests to avoid explicit request type here.
             if (!IsRequestValid(session, GroupRequestType.NewGroup, request))
@@ -124,7 +124,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequest request, CancellationToken cancellationToken)
+        public void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequestBody request, CancellationToken cancellationToken)
         {
             // TODO: create abstract class for GroupRequests to avoid explicit request type here.
             if (!IsRequestValid(session, GroupRequestType.JoinGroup, request))
@@ -304,7 +304,10 @@ namespace Emby.Server.Implementations.SyncPlay
                 return;
             }
 
-            var request = new JoinGroupRequest(groupId);
+            var request = new JoinGroupRequestBody()
+            {
+                GroupId = groupId
+            };
             JoinGroup(session, groupId, request, CancellationToken.None);
         }
 
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 530cce1ea..e8c9a0956 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Model.SyncPlay;
+using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -44,34 +45,32 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Create a new SyncPlay group.
         /// </summary>
-        /// <param name="groupName">The name of the new group.</param>
+        /// <param name="requestData">The settings of the new group.</param>
         /// <response code="204">New group created.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("New")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayCreateGroup(
-            [FromQuery, Required] string groupName)
+            [FromBody, Required] NewGroupRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var newGroupRequest = new NewGroupRequest(groupName);
-            _syncPlayManager.NewGroup(currentSession, newGroupRequest, CancellationToken.None);
+            _syncPlayManager.NewGroup(currentSession, requestData, CancellationToken.None);
             return NoContent();
         }
 
         /// <summary>
         /// Join an existing SyncPlay group.
         /// </summary>
-        /// <param name="groupId">The sync play group id.</param>
+        /// <param name="requestData">The group to join.</param>
         /// <response code="204">Group join successful.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Join")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayJoinGroup(
-            [FromQuery, Required] Guid groupId)
+            [FromBody, Required] JoinGroupRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var joinRequest = new JoinGroupRequest(groupId);
-            _syncPlayManager.JoinGroup(currentSession, groupId, joinRequest, CancellationToken.None);
+            _syncPlayManager.JoinGroup(currentSession, requestData.GroupId, requestData, CancellationToken.None);
             return NoContent();
         }
 
@@ -105,20 +104,19 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request play in SyncPlay group.
         /// </summary>
-        /// <param name="playingQueue">The playing queue. Item ids in the playing queue, comma delimited.</param>
-        /// <param name="playingItemPosition">The playing item position from the queue.</param>
-        /// <param name="startPositionTicks">The start position ticks.</param>
+        /// <param name="requestData">The new playlist to play in the group.</param>
         /// <response code="204">Play request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Play")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPlay(
-            [FromQuery, Required] Guid[] playingQueue,
-            [FromQuery, Required] int playingItemPosition,
-            [FromQuery, Required] long startPositionTicks)
+            [FromBody, Required] PlayRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PlayGroupRequest(playingQueue, playingItemPosition, startPositionTicks);
+            var syncPlayRequest = new PlayGroupRequest(
+                requestData.PlayingQueue,
+                requestData.PlayingItemPosition,
+                requestData.StartPositionTicks);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -126,16 +124,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to change playlist item in SyncPlay group.
         /// </summary>
-        /// <param name="playlistItemId">The playlist id of the item.</param>
+        /// <param name="requestData">The new item to play.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetPlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetPlaylistItem(
-            [FromQuery, Required] string playlistItemId)
+            [FromBody, Required] SetPlaylistItemRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetPlaylistItemGroupRequest(playlistItemId);
+            var syncPlayRequest = new SetPlaylistItemGroupRequest(requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -143,16 +141,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to remove items from the playlist in SyncPlay group.
         /// </summary>
-        /// <param name="playlistItemIds">The playlist ids of the items to remove.</param>
+        /// <param name="requestData">The items to remove.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("RemoveFromPlaylist")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayRemoveFromPlaylist(
-            [FromQuery, Required] string[] playlistItemIds)
+            [FromBody, Required] RemoveFromPlaylistRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new RemoveFromPlaylistGroupRequest(playlistItemIds);
+            var syncPlayRequest = new RemoveFromPlaylistGroupRequest(requestData.PlaylistItemIds);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -160,18 +158,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to move an item in the playlist in SyncPlay group.
         /// </summary>
-        /// <param name="playlistItemId">The playlist id of the item to move.</param>
-        /// <param name="newIndex">The new position.</param>
+        /// <param name="requestData">The new position for the item.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("MovePlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayMovePlaylistItem(
-            [FromQuery, Required] string playlistItemId,
-            [FromQuery, Required] int newIndex)
+            [FromBody, Required] MovePlaylistItemRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new MovePlaylistItemGroupRequest(playlistItemId, newIndex);
+            var syncPlayRequest = new MovePlaylistItemGroupRequest(requestData.PlaylistItemId, requestData.NewIndex);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -179,18 +175,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to queue items to the playlist of a SyncPlay group.
         /// </summary>
-        /// <param name="itemIds">The items to add.</param>
-        /// <param name="mode">The mode in which to enqueue the items.</param>
+        /// <param name="requestData">The items to add.</param>
         /// <response code="204">Queue update request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayQueue(
-            [FromQuery, Required] Guid[] itemIds,
-            [FromQuery, Required] GroupQueueMode mode)
+            [FromBody, Required] QueueRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new QueueGroupRequest(itemIds, mode);
+            var syncPlayRequest = new QueueGroupRequest(requestData.ItemIds, requestData.Mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -243,50 +237,58 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request seek in SyncPlay group.
         /// </summary>
-        /// <param name="positionTicks">The playback position in ticks.</param>
+        /// <param name="requestData">The new playback position.</param>
         /// <response code="204">Seek request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Seek")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySeek(
-            [FromQuery, Required] long positionTicks)
+            [FromBody, Required] SeekRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SeekGroupRequest(positionTicks);
+            var syncPlayRequest = new SeekGroupRequest(requestData.PositionTicks);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
         /// <summary>
-        /// Request group wait in SyncPlay group while buffering.
+        /// Notify SyncPlay group that member is buffering.
         /// </summary>
-        /// <param name="when">When the request has been made by the client.</param>
-        /// <param name="positionTicks">The playback position in ticks.</param>
-        /// <param name="isPlaying">Whether the client's playback is playing or not.</param>
-        /// <param name="playlistItemId">The playlist item id.</param>
-        /// <param name="bufferingDone">Whether the buffering is done.</param>
-        /// <response code="204">Buffering request sent to all group members.</response>
+        /// <param name="requestData">The player status.</param>
+        /// <response code="204">Group state update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Buffering")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayBuffering(
-            [FromQuery, Required] DateTime when,
-            [FromQuery, Required] long positionTicks,
-            [FromQuery, Required] bool isPlaying,
-            [FromQuery, Required] string playlistItemId,
-            [FromQuery, Required] bool bufferingDone)
+            [FromBody, Required] BufferRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            IGroupPlaybackRequest syncPlayRequest;
-            if (!bufferingDone)
-            {
-                syncPlayRequest = new BufferGroupRequest(when, positionTicks, isPlaying, playlistItemId);
-            }
-            else
-            {
-                syncPlayRequest = new ReadyGroupRequest(when, positionTicks, isPlaying, playlistItemId);
-            }
+            var syncPlayRequest = new BufferGroupRequest(
+                requestData.When,
+                requestData.PositionTicks,
+                requestData.IsPlaying,
+                requestData.PlaylistItemId);
+            _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
+            return NoContent();
+        }
 
+        /// <summary>
+        /// Notify SyncPlay group that member is ready for playback.
+        /// </summary>
+        /// <param name="requestData">The player status.</param>
+        /// <response code="204">Group state update sent to all group members.</response>
+        /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
+        [HttpPost("Ready")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public ActionResult SyncPlayReady(
+            [FromBody, Required] ReadyRequestBody requestData)
+        {
+            var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
+            var syncPlayRequest = new ReadyGroupRequest(
+                requestData.When,
+                requestData.PositionTicks,
+                requestData.IsPlaying,
+                requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -294,16 +296,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request SyncPlay group to ignore member during group-wait.
         /// </summary>
-        /// <param name="ignoreWait">Whether to ignore the member.</param>
+        /// <param name="requestData">The settings to set.</param>
         /// <response code="204">Member state updated.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetIgnoreWait")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetIgnoreWait(
-            [FromQuery, Required] bool ignoreWait)
+            [FromBody, Required] IgnoreWaitRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new IgnoreWaitGroupRequest(ignoreWait);
+            var syncPlayRequest = new IgnoreWaitGroupRequest(requestData.IgnoreWait);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -311,16 +313,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request next track in SyncPlay group.
         /// </summary>
-        /// <param name="playlistItemId">The playing item id.</param>
+        /// <param name="requestData">The current track information.</param>
         /// <response code="204">Next track request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("NextTrack")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayNextTrack(
-            [FromQuery, Required] string playlistItemId)
+            [FromBody, Required] NextTrackRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new NextTrackGroupRequest(playlistItemId);
+            var syncPlayRequest = new NextTrackGroupRequest(requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -328,16 +330,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request previous track in SyncPlay group.
         /// </summary>
-        /// <param name="playlistItemId">The playing item id.</param>
+        /// <param name="requestData">The current track information.</param>
         /// <response code="204">Previous track request sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("PreviousTrack")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPreviousTrack(
-            [FromQuery, Required] string playlistItemId)
+            [FromBody, Required] PreviousTrackRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PreviousTrackGroupRequest(playlistItemId);
+            var syncPlayRequest = new PreviousTrackGroupRequest(requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -345,16 +347,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to set repeat mode in SyncPlay group.
         /// </summary>
-        /// <param name="mode">The repeat mode.</param>
+        /// <param name="requestData">The new repeat mode.</param>
         /// <response code="204">Play queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetRepeatMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetRepeatMode(
-            [FromQuery, Required] GroupRepeatMode mode)
+            [FromBody, Required] SetRepeatModeRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetRepeatModeGroupRequest(mode);
+            var syncPlayRequest = new SetRepeatModeGroupRequest(requestData.Mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -362,16 +364,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request to set shuffle mode in SyncPlay group.
         /// </summary>
-        /// <param name="mode">The shuffle mode.</param>
+        /// <param name="requestData">The new shuffle mode.</param>
         /// <response code="204">Play queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetShuffleMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetShuffleMode(
-            [FromQuery, Required] GroupShuffleMode mode)
+            [FromBody, Required] SetShuffleModeRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new SetShuffleModeGroupRequest(mode);
+            var syncPlayRequest = new SetShuffleModeGroupRequest(requestData.Mode);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
@@ -379,16 +381,16 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Update session ping.
         /// </summary>
-        /// <param name="ping">The ping.</param>
+        /// <param name="requestData">The new ping.</param>
         /// <response code="204">Ping updated.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Ping")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPing(
-            [FromQuery, Required] double ping)
+            [FromBody, Required] PingRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PingGroupRequest(Convert.ToInt64(ping));
+            var syncPlayRequest = new PingGroupRequest(requestData.Ping);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupController.cs b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
index aa8bb9eae..5bcc3e2ca 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupController.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
@@ -4,6 +4,7 @@ using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay.Queue;
 using MediaBrowser.Model.SyncPlay;
+using MediaBrowser.Model.SyncPlay.RequestBodies;
 
 namespace MediaBrowser.Controller.SyncPlay
 {
@@ -36,7 +37,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
+        void CreateGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Adds the session to the group.
@@ -44,7 +45,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
+        void SessionJoin(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Restores the state of a session that already joined the group.
@@ -52,7 +53,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
+        void SessionRestore(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Removes the session from the group.
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index a98001682..26fcb009c 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.SyncPlay;
+using MediaBrowser.Model.SyncPlay.RequestBodies;
 
 namespace MediaBrowser.Controller.SyncPlay
 {
@@ -17,7 +18,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session that's creating the group.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
+        void NewGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Adds the session to a group.
@@ -26,7 +27,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="groupId">The group identifier.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequest request, CancellationToken cancellationToken);
+        void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequestBody request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Removes the session from a group.
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
index 7d27f6151..dbe298735 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// <param name="playingQueue">The playing queue.</param>
         /// <param name="playingItemPosition">The playing item position.</param>
         /// <param name="startPositionTicks">The start position ticks.</param>
-        public PlayGroupRequest(Guid[] playingQueue, int playingItemPosition, long startPositionTicks)
+        public PlayGroupRequest(IReadOnlyList<Guid> playingQueue, int playingItemPosition, long startPositionTicks)
         {
             PlayingQueue = playingQueue ?? Array.Empty<Guid>();
             PlayingItemPosition = playingItemPosition;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
index 106daecc8..d6247ddd6 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// </summary>
         /// <param name="items">The items to add to the queue.</param>
         /// <param name="mode">The enqueue mode.</param>
-        public QueueGroupRequest(Guid[] items, GroupQueueMode mode)
+        public QueueGroupRequest(IReadOnlyList<Guid> items, GroupQueueMode mode)
         {
             ItemIds = items ?? Array.Empty<Guid>();
             Mode = mode;
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
index 1e892d819..dc7ba8465 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         /// Initializes a new instance of the <see cref="RemoveFromPlaylistGroupRequest"/> class.
         /// </summary>
         /// <param name="items">The playlist ids of the items to remove.</param>
-        public RemoveFromPlaylistGroupRequest(string[] items)
+        public RemoveFromPlaylistGroupRequest(IReadOnlyList<string> items)
         {
             PlaylistItemIds = items ?? Array.Empty<string>();
         }
diff --git a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs b/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
deleted file mode 100644
index 7402c4ce2..000000000
--- a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.SyncPlay
-{
-    /// <summary>
-    /// Class JoinGroupRequest.
-    /// </summary>
-    public class JoinGroupRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JoinGroupRequest"/> class.
-        /// </summary>
-        /// <param name="groupId">The identifier of the group to join.</param>
-        public JoinGroupRequest(Guid groupId)
-        {
-            GroupId = groupId;
-        }
-
-        /// <summary>
-        /// Gets the group identifier.
-        /// </summary>
-        /// <value>The identifier of the group to join.</value>
-        public Guid GroupId { get; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs b/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
deleted file mode 100644
index ba4bd3ef1..000000000
--- a/MediaBrowser.Model/SyncPlay/NewGroupRequest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay
-{
-    /// <summary>
-    /// Class NewGroupRequest.
-    /// </summary>
-    public class NewGroupRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NewGroupRequest"/> class.
-        /// </summary>
-        /// <param name="groupName">The name of the new group.</param>
-        public NewGroupRequest(string groupName)
-        {
-            GroupName = groupName;
-        }
-
-        /// <summary>
-        /// Gets the group name.
-        /// </summary>
-        /// <value>The name of the new group.</value>
-        public string GroupName { get; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
new file mode 100644
index 000000000..09ca712e5
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class BufferRequestBody.
+    /// </summary>
+    public class BufferRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BufferRequestBody"/> class.
+        /// </summary>
+        public BufferRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
new file mode 100644
index 000000000..22407e88e
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class IgnoreWaitRequestBody.
+    /// </summary>
+    public class IgnoreWaitRequestBody
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the client should be ignored.
+        /// </summary>
+        /// <value>The client group-wait status.</value>
+        public bool IgnoreWait { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
new file mode 100644
index 000000000..2cec7bdc2
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class JoinGroupRequestBody.
+    /// </summary>
+    public class JoinGroupRequestBody
+    {
+        /// <summary>
+        /// Gets or sets the group identifier.
+        /// </summary>
+        /// <value>The identifier of the group to join.</value>
+        public Guid GroupId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
new file mode 100644
index 000000000..d18eb68ff
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
@@ -0,0 +1,28 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class MovePlaylistItemRequestBody.
+    /// </summary>
+    public class MovePlaylistItemRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovePlaylistItemRequestBody"/> class.
+        /// </summary>
+        public MovePlaylistItemRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifier of the item.
+        /// </summary>
+        /// <value>The playlist identifier of the item.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new position.
+        /// </summary>
+        /// <value>The new position.</value>
+        public int NewIndex { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
new file mode 100644
index 000000000..1a85d276b
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class NewGroupRequestBody.
+    /// </summary>
+    public class NewGroupRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NewGroupRequestBody"/> class.
+        /// </summary>
+        public NewGroupRequestBody()
+        {
+            GroupName = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the group name.
+        /// </summary>
+        /// <value>The name of the new group.</value>
+        public string GroupName { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
new file mode 100644
index 000000000..1d8d135cb
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class NextTrackRequestBody.
+    /// </summary>
+    public class NextTrackRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NextTrackRequestBody"/> class.
+        /// </summary>
+        public NextTrackRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
new file mode 100644
index 000000000..f08015bc4
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class PingRequestBody.
+    /// </summary>
+    public class PingRequestBody
+    {
+        /// <summary>
+        /// Gets or sets the ping time.
+        /// </summary>
+        /// <value>The ping time.</value>
+        public long Ping { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
new file mode 100644
index 000000000..97ec95c62
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class PlayRequestBody.
+    /// </summary>
+    public class PlayRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayRequestBody"/> class.
+        /// </summary>
+        public PlayRequestBody()
+        {
+            PlayingQueue = Array.Empty<Guid>();
+        }
+
+        /// <summary>
+        /// Gets or sets the playing queue.
+        /// </summary>
+        /// <value>The playing queue.</value>
+        public IReadOnlyList<Guid> PlayingQueue { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position of the playing item in the queue.
+        /// </summary>
+        /// <value>The playing item position.</value>
+        public int PlayingItemPosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start position ticks.
+        /// </summary>
+        /// <value>The start position ticks.</value>
+        public long StartPositionTicks { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs
new file mode 100644
index 000000000..95ebeeb90
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class PreviousTrackRequestBody.
+    /// </summary>
+    public class PreviousTrackRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousTrackRequestBody"/> class.
+        /// </summary>
+        public PreviousTrackRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
new file mode 100644
index 000000000..1afc61dd4
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class QueueRequestBody.
+    /// </summary>
+    public class QueueRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueueRequestBody"/> class.
+        /// </summary>
+        public QueueRequestBody()
+        {
+            ItemIds = Array.Empty<Guid>();
+        }
+
+        /// <summary>
+        /// Gets or sets the items to enqueue.
+        /// </summary>
+        /// <value>The items to enqueue.</value>
+        public IReadOnlyList<Guid> ItemIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mode in which to add the new items.
+        /// </summary>
+        /// <value>The enqueue mode.</value>
+        public GroupQueueMode Mode { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
new file mode 100644
index 000000000..359186e78
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class ReadyRequest.
+    /// </summary>
+    public class ReadyRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReadyRequestBody"/> class.
+        /// </summary>
+        public ReadyRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
new file mode 100644
index 000000000..a2b617cd0
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class RemoveFromPlaylistRequestBody.
+    /// </summary>
+    public class RemoveFromPlaylistRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveFromPlaylistRequestBody"/> class.
+        /// </summary>
+        public RemoveFromPlaylistRequestBody()
+        {
+            PlaylistItemIds = Array.Empty<string>();
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifiers ot the items.
+        /// </summary>
+        /// <value>The playlist identifiers ot the items.</value>
+        public IReadOnlyList<string> PlaylistItemIds { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
new file mode 100644
index 000000000..689183bb6
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class SeekRequestBody.
+    /// </summary>
+    public class SeekRequestBody
+    {
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
new file mode 100644
index 000000000..abe66c479
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class SetPlaylistItemRequestBody.
+    /// </summary>
+    public class SetPlaylistItemRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetPlaylistItemRequestBody"/> class.
+        /// </summary>
+        public SetPlaylistItemRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist identifier of the playing item.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
new file mode 100644
index 000000000..6de5415ca
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class SetRepeatModeRequestBody.
+    /// </summary>
+    public class SetRepeatModeRequestBody
+    {
+        /// <summary>
+        /// Gets or sets the repeat mode.
+        /// </summary>
+        /// <value>The repeat mode.</value>
+        public GroupRepeatMode Mode { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs
new file mode 100644
index 000000000..867cb938d
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class SetShuffleModeRequestBody.
+    /// </summary>
+    public class SetShuffleModeRequestBody
+    {
+        /// <summary>
+        /// Gets or sets the shuffle mode.
+        /// </summary>
+        /// <value>The shuffle mode.</value>
+        public GroupShuffleMode Mode { get; set; }
+    }
+}
-- 
cgit v1.2.3


From 78ea8ef99e68eb606c96399895b224e91db15163 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Sat, 28 Nov 2020 16:03:02 +0100
Subject: Create common interface for SyncPlay requests

---
 .../SyncPlay/GroupController.cs                    | 12 ++--
 .../SyncPlay/SyncPlayManager.cs                    | 69 ++++++++--------------
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 13 ++--
 .../SyncPlay/GroupStates/AbstractGroupState.cs     |  4 +-
 .../SyncPlay/IGroupController.cs                   | 11 ++--
 .../SyncPlay/IGroupPlaybackRequest.cs              |  4 +-
 .../SyncPlay/ISyncPlayManager.cs                   | 12 ++--
 .../SyncPlay/ISyncPlayRequest.cs                   | 16 +++++
 .../PlaybackRequests/AbstractPlaybackRequest.cs    | 29 +++++++++
 .../PlaybackRequests/BufferGroupRequest.cs         |  6 +-
 .../PlaybackRequests/IgnoreWaitGroupRequest.cs     |  6 +-
 .../MovePlaylistItemGroupRequest.cs                |  6 +-
 .../PlaybackRequests/NextTrackGroupRequest.cs      |  6 +-
 .../SyncPlay/PlaybackRequests/PauseGroupRequest.cs |  6 +-
 .../SyncPlay/PlaybackRequests/PingGroupRequest.cs  |  6 +-
 .../SyncPlay/PlaybackRequests/PlayGroupRequest.cs  |  6 +-
 .../PlaybackRequests/PreviousTrackGroupRequest.cs  |  6 +-
 .../SyncPlay/PlaybackRequests/QueueGroupRequest.cs |  6 +-
 .../SyncPlay/PlaybackRequests/ReadyGroupRequest.cs |  6 +-
 .../RemoveFromPlaylistGroupRequest.cs              |  6 +-
 .../SyncPlay/PlaybackRequests/SeekGroupRequest.cs  |  6 +-
 .../SetPlaylistItemGroupRequest.cs                 |  6 +-
 .../PlaybackRequests/SetRepeatModeGroupRequest.cs  |  6 +-
 .../PlaybackRequests/SetShuffleModeGroupRequest.cs |  6 +-
 .../SyncPlay/PlaybackRequests/StopGroupRequest.cs  |  6 +-
 .../PlaybackRequests/UnpauseGroupRequest.cs        |  6 +-
 .../SyncPlay/Requests/JoinGroupRequest.cs          | 29 +++++++++
 .../SyncPlay/Requests/LeaveGroupRequest.cs         | 13 ++++
 .../SyncPlay/Requests/ListGroupsRequest.cs         | 13 ++++
 .../SyncPlay/Requests/NewGroupRequest.cs           | 28 +++++++++
 MediaBrowser.Model/SyncPlay/GroupRequestType.cs    | 33 -----------
 MediaBrowser.Model/SyncPlay/RequestType.cs         | 33 +++++++++++
 32 files changed, 269 insertions(+), 152 deletions(-)
 create mode 100644 MediaBrowser.Controller/SyncPlay/ISyncPlayRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/Requests/JoinGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/Requests/LeaveGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/Requests/ListGroupsRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/Requests/NewGroupRequest.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/GroupRequestType.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestType.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs
index 612fba504..dc262f1cf 100644
--- a/Emby.Server.Implementations/SyncPlay/GroupController.cs
+++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs
@@ -12,8 +12,8 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Controller.SyncPlay.GroupStates;
 using MediaBrowser.Controller.SyncPlay.Queue;
+using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.SyncPlay
@@ -257,7 +257,7 @@ namespace Emby.Server.Implementations.SyncPlay
         public bool IsGroupEmpty() => _participants.Count == 0;
 
         /// <inheritdoc />
-        public void CreateGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken)
+        public void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
         {
             GroupName = request.GroupName;
             AddSession(session);
@@ -292,7 +292,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SessionJoin(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken)
+        public void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
         {
             AddSession(session);
 
@@ -308,7 +308,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SessionRestore(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken)
+        public void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
         {
             var updateSession = NewSyncPlayGroupUpdate(GroupUpdateType.GroupJoined, GetInfo());
             SendGroupUpdate(session, SyncPlayBroadcastType.CurrentSession, updateSession, cancellationToken);
@@ -322,7 +322,7 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void SessionLeave(SessionInfo session, CancellationToken cancellationToken)
+        public void SessionLeave(SessionInfo session, LeaveGroupRequest request, CancellationToken cancellationToken)
         {
             _state.SessionLeaving(this, _state.Type, session, cancellationToken);
 
@@ -343,7 +343,7 @@ namespace Emby.Server.Implementations.SyncPlay
             // The server's job is to maintain a consistent state for clients to reference
             // and notify clients of state changes. The actual syncing of media playback
             // happens client side. Clients are aware of the server's time and use it to sync.
-            _logger.LogInformation("Session {SessionId} requested {RequestType} in group {GroupId} that is {StateType}.", session.Id, request.Type, GroupId.ToString(), _state.Type);
+            _logger.LogInformation("Session {SessionId} requested {RequestType} in group {GroupId} that is {StateType}.", session.Id, request.Action, GroupId.ToString(), _state.Type);
             request.Apply(this, _state, session, cancellationToken);
         }
 
diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index 5a0d61926..fbd3c3cfb 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -5,8 +5,8 @@ using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
+using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.SyncPlay
@@ -94,10 +94,9 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void NewGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken)
+        public void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
         {
-            // TODO: create abstract class for GroupRequests to avoid explicit request type here.
-            if (!IsRequestValid(session, GroupRequestType.NewGroup, request))
+            if (!IsRequestValid(session, request))
             {
                 return;
             }
@@ -111,7 +110,8 @@ namespace Emby.Server.Implementations.SyncPlay
                 {
                     if (IsSessionInGroup(session))
                     {
-                        LeaveGroup(session, cancellationToken);
+                        var leaveGroupRequest = new LeaveGroupRequest();
+                        LeaveGroup(session, leaveGroupRequest, cancellationToken);
                     }
 
                     var group = new GroupController(_loggerFactory, _userManager, _sessionManager, _libraryManager);
@@ -124,10 +124,9 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequestBody request, CancellationToken cancellationToken)
+        public void JoinGroup(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
         {
-            // TODO: create abstract class for GroupRequests to avoid explicit request type here.
-            if (!IsRequestValid(session, GroupRequestType.JoinGroup, request))
+            if (!IsRequestValid(session, request))
             {
                 return;
             }
@@ -137,11 +136,11 @@ namespace Emby.Server.Implementations.SyncPlay
             // Locking required to access list of groups.
             lock (_groupsLock)
             {
-                _groups.TryGetValue(groupId, out IGroupController group);
+                _groups.TryGetValue(request.GroupId, out IGroupController group);
 
                 if (group == null)
                 {
-                    _logger.LogWarning("Session {SessionId} tried to join group {GroupId} that does not exist.", session.Id, groupId);
+                    _logger.LogWarning("Session {SessionId} tried to join group {GroupId} that does not exist.", session.Id, request.GroupId);
 
                     var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.GroupDoesNotExist, string.Empty);
                     _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
@@ -165,13 +164,14 @@ namespace Emby.Server.Implementations.SyncPlay
 
                         if (IsSessionInGroup(session))
                         {
-                            if (FindJoinedGroupId(session).Equals(groupId))
+                            if (FindJoinedGroupId(session).Equals(request.GroupId))
                             {
                                 group.SessionRestore(session, request, cancellationToken);
                                 return;
                             }
 
-                            LeaveGroup(session, cancellationToken);
+                            var leaveGroupRequest = new LeaveGroupRequest();
+                            LeaveGroup(session, leaveGroupRequest, cancellationToken);
                         }
 
                         AddSessionToGroup(session, group);
@@ -182,10 +182,9 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public void LeaveGroup(SessionInfo session, CancellationToken cancellationToken)
+        public void LeaveGroup(SessionInfo session, LeaveGroupRequest request, CancellationToken cancellationToken)
         {
-            // TODO: create abstract class for GroupRequests to avoid explicit request type here.
-            if (!IsRequestValid(session, GroupRequestType.LeaveGroup))
+            if (!IsRequestValid(session, request))
             {
                 return;
             }
@@ -210,7 +209,7 @@ namespace Emby.Server.Implementations.SyncPlay
                     lock (group)
                     {
                         RemoveSessionFromGroup(session, group);
-                        group.SessionLeave(session, cancellationToken);
+                        group.SessionLeave(session, request, cancellationToken);
 
                         if (group.IsGroupEmpty())
                         {
@@ -223,10 +222,9 @@ namespace Emby.Server.Implementations.SyncPlay
         }
 
         /// <inheritdoc />
-        public List<GroupInfoDto> ListGroups(SessionInfo session)
+        public List<GroupInfoDto> ListGroups(SessionInfo session, ListGroupsRequest request)
         {
-            // TODO: create abstract class for GroupRequests to avoid explicit request type here.
-            if (!IsRequestValid(session, GroupRequestType.ListGroups))
+            if (!IsRequestValid(session, request))
             {
                 return new List<GroupInfoDto>();
             }
@@ -256,8 +254,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken)
         {
-            // TODO: create abstract class for GroupRequests to avoid explicit request type here.
-            if (!IsRequestValid(session, GroupRequestType.Playback, request))
+            if (!IsRequestValid(session, request))
             {
                 return;
             }
@@ -304,11 +301,8 @@ namespace Emby.Server.Implementations.SyncPlay
                 return;
             }
 
-            var request = new JoinGroupRequestBody()
-            {
-                GroupId = groupId
-            };
-            JoinGroup(session, groupId, request, CancellationToken.None);
+            var request = new JoinGroupRequest(groupId);
+            JoinGroup(session, request, CancellationToken.None);
         }
 
         /// <summary>
@@ -409,13 +403,11 @@ namespace Emby.Server.Implementations.SyncPlay
         /// Checks if a given session is allowed to make a given request.
         /// </summary>
         /// <param name="session">The session.</param>
-        /// <param name="requestType">The request type.</param>
         /// <param name="request">The request.</param>
-        /// <param name="checkRequest">Whether to check if request is null.</param>
-        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session is null.</returns>
-        private bool IsRequestValid<T>(SessionInfo session, GroupRequestType requestType, T request, bool checkRequest = true)
+        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session or request is null.</returns>
+        private bool IsRequestValid(SessionInfo session, ISyncPlayRequest request)
         {
-            if (session == null || (request == null && checkRequest))
+            if (session == null || (request == null))
             {
                 return false;
             }
@@ -424,7 +416,7 @@ namespace Emby.Server.Implementations.SyncPlay
 
             if (user.SyncPlayAccess == SyncPlayAccess.None)
             {
-                _logger.LogWarning("Session {SessionId} requested {RequestType} but does not have access to SyncPlay.", session.Id, requestType);
+                _logger.LogWarning("Session {SessionId} requested {RequestType} but does not have access to SyncPlay.", session.Id, request.Type);
 
                 // TODO: rename to a more generic error. Next PR will fix this.
                 var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.JoinGroupDenied, string.Empty);
@@ -432,7 +424,7 @@ namespace Emby.Server.Implementations.SyncPlay
                 return false;
             }
 
-            if (requestType.Equals(GroupRequestType.NewGroup) && user.SyncPlayAccess != SyncPlayAccess.CreateAndJoinGroups)
+            if (request.Type.Equals(RequestType.NewGroup) && user.SyncPlayAccess != SyncPlayAccess.CreateAndJoinGroups)
             {
                 _logger.LogWarning("Session {SessionId} does not have permission to create groups.", session.Id);
 
@@ -443,16 +435,5 @@ namespace Emby.Server.Implementations.SyncPlay
 
             return true;
         }
-
-        /// <summary>
-        /// Checks if a given session is allowed to make a given type of request.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="requestType">The request type.</param>
-        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session is null.</returns>
-        private bool IsRequestValid(SessionInfo session, GroupRequestType requestType)
-        {
-            return IsRequestValid(session, requestType, session, false);
-        }
     }
 }
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index e8c9a0956..ed5ea3c8a 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
+using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
 using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.AspNetCore.Authorization;
@@ -54,7 +55,8 @@ namespace Jellyfin.Api.Controllers
             [FromBody, Required] NewGroupRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            _syncPlayManager.NewGroup(currentSession, requestData, CancellationToken.None);
+            var syncPlayRequest = new NewGroupRequest(requestData.GroupName);
+            _syncPlayManager.NewGroup(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
@@ -70,7 +72,8 @@ namespace Jellyfin.Api.Controllers
             [FromBody, Required] JoinGroupRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            _syncPlayManager.JoinGroup(currentSession, requestData.GroupId, requestData, CancellationToken.None);
+            var syncPlayRequest = new JoinGroupRequest(requestData.GroupId);
+            _syncPlayManager.JoinGroup(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
@@ -84,7 +87,8 @@ namespace Jellyfin.Api.Controllers
         public ActionResult SyncPlayLeaveGroup()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            _syncPlayManager.LeaveGroup(currentSession, CancellationToken.None);
+            var syncPlayRequest = new LeaveGroupRequest();
+            _syncPlayManager.LeaveGroup(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
@@ -98,7 +102,8 @@ namespace Jellyfin.Api.Controllers
         public ActionResult<IEnumerable<GroupInfoDto>> SyncPlayGetGroups()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            return Ok(_syncPlayManager.ListGroups(currentSession));
+            var syncPlayRequest = new ListGroupsRequest();
+            return Ok(_syncPlayManager.ListGroups(currentSession, syncPlayRequest));
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
index 057488d6b..0b15e3ae4 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
@@ -209,14 +209,14 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         protected void SendGroupStateUpdate(IGroupStateContext context, IGroupPlaybackRequest reason, SessionInfo session, CancellationToken cancellationToken)
         {
             // Notify relevant state change event.
-            var stateUpdate = new GroupStateUpdate(Type, reason.Type);
+            var stateUpdate = new GroupStateUpdate(Type, reason.Action);
             var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.StateUpdate, stateUpdate);
             context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
         }
 
         private void UnhandledRequest(IGroupPlaybackRequest request)
         {
-            _logger.LogWarning("Unhandled request of type {RequestType} in {StateType} state.", request.Type, Type);
+            _logger.LogWarning("Unhandled request of type {RequestType} in {StateType} state.", request.Action, Type);
         }
     }
 }
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupController.cs b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
index 5bcc3e2ca..07f9659dd 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupController.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupController.cs
@@ -3,8 +3,8 @@ using System.Threading;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay.Queue;
+using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Model.SyncPlay.RequestBodies;
 
 namespace MediaBrowser.Controller.SyncPlay
 {
@@ -37,7 +37,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void CreateGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken);
+        void CreateGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Adds the session to the group.
@@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionJoin(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken);
+        void SessionJoin(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Restores the state of a session that already joined the group.
@@ -53,14 +53,15 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionRestore(SessionInfo session, JoinGroupRequestBody request, CancellationToken cancellationToken);
+        void SessionRestore(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Removes the session from the group.
         /// </summary>
         /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void SessionLeave(SessionInfo session, CancellationToken cancellationToken);
+        void SessionLeave(SessionInfo session, LeaveGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Handles the requested action by the session.
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs b/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
index 3b195e98c..201f29952 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupPlaybackRequest.cs
@@ -7,13 +7,13 @@ namespace MediaBrowser.Controller.SyncPlay
     /// <summary>
     /// Interface IGroupPlaybackRequest.
     /// </summary>
-    public interface IGroupPlaybackRequest
+    public interface IGroupPlaybackRequest : ISyncPlayRequest
     {
         /// <summary>
         /// Gets the playback request type.
         /// </summary>
         /// <returns>The playback request type.</returns>
-        PlaybackRequestType Type { get; }
+        PlaybackRequestType Action { get; }
 
         /// <summary>
         /// Applies the request to a group.
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index 26fcb009c..146e4351d 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
 using MediaBrowser.Model.SyncPlay.RequestBodies;
 
@@ -18,30 +19,31 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session that's creating the group.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void NewGroup(SessionInfo session, NewGroupRequestBody request, CancellationToken cancellationToken);
+        void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Adds the session to a group.
         /// </summary>
         /// <param name="session">The session.</param>
-        /// <param name="groupId">The group identifier.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequestBody request, CancellationToken cancellationToken);
+        void JoinGroup(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Removes the session from a group.
         /// </summary>
         /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void LeaveGroup(SessionInfo session, CancellationToken cancellationToken);
+        void LeaveGroup(SessionInfo session, LeaveGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets list of available groups for a session.
         /// </summary>
         /// <param name="session">The session.</param>
+        /// <param name="request">The request.</param>
         /// <returns>The list of available groups.</returns>
-        List<GroupInfoDto> ListGroups(SessionInfo session);
+        List<GroupInfoDto> ListGroups(SessionInfo session, ListGroupsRequest request);
 
         /// <summary>
         /// Handle a request by a session in a group.
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayRequest.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayRequest.cs
new file mode 100644
index 000000000..bf1981773
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayRequest.cs
@@ -0,0 +1,16 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay
+{
+    /// <summary>
+    /// Interface ISyncPlayRequest.
+    /// </summary>
+    public interface ISyncPlayRequest
+    {
+        /// <summary>
+        /// Gets the request type.
+        /// </summary>
+        /// <returns>The request type.</returns>
+        RequestType Type { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs
new file mode 100644
index 000000000..4090f65b9
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs
@@ -0,0 +1,29 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class AbstractPlaybackRequest.
+    /// </summary>
+    public abstract class AbstractPlaybackRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractPlaybackRequest"/> class.
+        /// </summary>
+        protected AbstractPlaybackRequest()
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.Playback;
+
+        /// <inheritdoc />
+        public abstract PlaybackRequestType Action { get; }
+
+        /// <inheritdoc />
+        public abstract void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
index a12ab96b7..2981dbbdd 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class BufferGroupRequest.
     /// </summary>
-    public class BufferGroupRequest : IGroupPlaybackRequest
+    public class BufferGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="BufferGroupRequest"/> class.
@@ -50,10 +50,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public string PlaylistItemId { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Buffer;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Buffer;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
index 25034cb10..a375895ad 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class IgnoreWaitGroupRequest.
     /// </summary>
-    public class IgnoreWaitGroupRequest : IGroupPlaybackRequest
+    public class IgnoreWaitGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="IgnoreWaitGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public bool IgnoreWait { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.IgnoreWait;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.IgnoreWait;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
index a12eff8b8..efca4ed3e 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class MovePlaylistItemGroupRequest.
     /// </summary>
-    public class MovePlaylistItemGroupRequest : IGroupPlaybackRequest
+    public class MovePlaylistItemGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MovePlaylistItemGroupRequest"/> class.
@@ -33,10 +33,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public int NewIndex { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.MovePlaylistItem;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.MovePlaylistItem;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
index f87bbc556..73b7d0908 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class NextTrackGroupRequest.
     /// </summary>
-    public class NextTrackGroupRequest : IGroupPlaybackRequest
+    public class NextTrackGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="NextTrackGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public string PlaylistItemId { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.NextTrack;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextTrack;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
index 0dcd1423f..8ce2b1fc8 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
@@ -7,13 +7,13 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class PauseGroupRequest.
     /// </summary>
-    public class PauseGroupRequest : IGroupPlaybackRequest
+    public class PauseGroupRequest : AbstractPlaybackRequest
     {
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Pause;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Pause;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
index 2528bb3e7..19c940cdf 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class PingGroupRequest.
     /// </summary>
-    public class PingGroupRequest : IGroupPlaybackRequest
+    public class PingGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PingGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public long Ping { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Ping;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Ping;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
index dbe298735..88e0ebad2 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class PlayGroupRequest.
     /// </summary>
-    public class PlayGroupRequest : IGroupPlaybackRequest
+    public class PlayGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PlayGroupRequest"/> class.
@@ -43,10 +43,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public long StartPositionTicks { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Play;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Play;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
index 206fef331..4c70beb0e 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class PreviousTrackGroupRequest.
     /// </summary>
-    public class PreviousTrackGroupRequest : IGroupPlaybackRequest
+    public class PreviousTrackGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PreviousTrackGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public string PlaylistItemId { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.PreviousTrack;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousTrack;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
index d6247ddd6..ba5e3e232 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class QueueGroupRequest.
     /// </summary>
-    public class QueueGroupRequest : IGroupPlaybackRequest
+    public class QueueGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="QueueGroupRequest"/> class.
@@ -35,10 +35,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public GroupQueueMode Mode { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Queue;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Queue;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
index a2b3553ce..b09db4ba8 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class ReadyGroupRequest.
     /// </summary>
-    public class ReadyGroupRequest : IGroupPlaybackRequest
+    public class ReadyGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ReadyGroupRequest"/> class.
@@ -50,10 +50,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public string PlaylistItemId { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Ready;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Ready;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
index dc7ba8465..dac1914aa 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class RemoveFromPlaylistGroupRequest.
     /// </summary>
-    public class RemoveFromPlaylistGroupRequest : IGroupPlaybackRequest
+    public class RemoveFromPlaylistGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RemoveFromPlaylistGroupRequest"/> class.
@@ -27,10 +27,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public IReadOnlyList<string> PlaylistItemIds { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.RemoveFromPlaylist;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.RemoveFromPlaylist;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
index f7bfc1978..41e28467c 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class SeekGroupRequest.
     /// </summary>
-    public class SeekGroupRequest : IGroupPlaybackRequest
+    public class SeekGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SeekGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public long PositionTicks { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Seek;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Seek;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
index 2ca33c1cc..58fed3fa0 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class SetPlaylistItemGroupRequest.
     /// </summary>
-    public class SetPlaylistItemGroupRequest : IGroupPlaybackRequest
+    public class SetPlaylistItemGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SetPlaylistItemGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public string PlaylistItemId { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetPlaylistItem;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetPlaylistItem;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
index cd4505e4d..6a5ec1d11 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class SetRepeatModeGroupRequest.
     /// </summary>
-    public class SetRepeatModeGroupRequest : IGroupPlaybackRequest
+    public class SetRepeatModeGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SetRepeatModeGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public GroupRepeatMode Mode { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetRepeatMode;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetRepeatMode;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
index 4530a34c0..fe007c8d8 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class SetShuffleModeGroupRequest.
     /// </summary>
-    public class SetShuffleModeGroupRequest : IGroupPlaybackRequest
+    public class SetShuffleModeGroupRequest : AbstractPlaybackRequest
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SetShuffleModeGroupRequest"/> class.
@@ -25,10 +25,10 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
         public GroupShuffleMode Mode { get; }
 
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.SetShuffleMode;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetShuffleMode;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
index ec01cd110..c42e229d1 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
@@ -7,13 +7,13 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class StopGroupRequest.
     /// </summary>
-    public class StopGroupRequest : IGroupPlaybackRequest
+    public class StopGroupRequest : AbstractPlaybackRequest
     {
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Stop;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Stop;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
index bdf4fd476..b4c1744e9 100644
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
@@ -7,13 +7,13 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
     /// <summary>
     /// Class UnpauseGroupRequest.
     /// </summary>
-    public class UnpauseGroupRequest : IGroupPlaybackRequest
+    public class UnpauseGroupRequest : AbstractPlaybackRequest
     {
         /// <inheritdoc />
-        public PlaybackRequestType Type { get; } = PlaybackRequestType.Unpause;
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Unpause;
 
         /// <inheritdoc />
-        public void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
         {
             state.HandleRequest(context, state.Type, this, session, cancellationToken);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/Requests/JoinGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/Requests/JoinGroupRequest.cs
new file mode 100644
index 000000000..38c9e8e20
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/Requests/JoinGroupRequest.cs
@@ -0,0 +1,29 @@
+using System;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.Requests
+{
+    /// <summary>
+    /// Class JoinGroupRequest.
+    /// </summary>
+    public class JoinGroupRequest : ISyncPlayRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JoinGroupRequest"/> class.
+        /// </summary>
+        /// <param name="groupId">The identifier of the group to join.</param>
+        public JoinGroupRequest(Guid groupId)
+        {
+            GroupId = groupId;
+        }
+
+        /// <summary>
+        /// Gets the group identifier.
+        /// </summary>
+        /// <value>The identifier of the group to join.</value>
+        public Guid GroupId { get; }
+
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.JoinGroup;
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/Requests/LeaveGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/Requests/LeaveGroupRequest.cs
new file mode 100644
index 000000000..545778264
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/Requests/LeaveGroupRequest.cs
@@ -0,0 +1,13 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.Requests
+{
+    /// <summary>
+    /// Class LeaveGroupRequest.
+    /// </summary>
+    public class LeaveGroupRequest : ISyncPlayRequest
+    {
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.LeaveGroup;
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/Requests/ListGroupsRequest.cs b/MediaBrowser.Controller/SyncPlay/Requests/ListGroupsRequest.cs
new file mode 100644
index 000000000..4a234fdab
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/Requests/ListGroupsRequest.cs
@@ -0,0 +1,13 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.Requests
+{
+    /// <summary>
+    /// Class ListGroupsRequest.
+    /// </summary>
+    public class ListGroupsRequest : ISyncPlayRequest
+    {
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.ListGroups;
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/Requests/NewGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/Requests/NewGroupRequest.cs
new file mode 100644
index 000000000..1321f0de8
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/Requests/NewGroupRequest.cs
@@ -0,0 +1,28 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.Requests
+{
+    /// <summary>
+    /// Class NewGroupRequest.
+    /// </summary>
+    public class NewGroupRequest : ISyncPlayRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NewGroupRequest"/> class.
+        /// </summary>
+        /// <param name="groupName">The name of the new group.</param>
+        public NewGroupRequest(string groupName)
+        {
+            GroupName = groupName;
+        }
+
+        /// <summary>
+        /// Gets the group name.
+        /// </summary>
+        /// <value>The name of the new group.</value>
+        public string GroupName { get; }
+
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.NewGroup;
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/GroupRequestType.cs b/MediaBrowser.Model/SyncPlay/GroupRequestType.cs
deleted file mode 100644
index 75c071236..000000000
--- a/MediaBrowser.Model/SyncPlay/GroupRequestType.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay
-{
-    /// <summary>
-    /// Enum GroupRequestType.
-    /// </summary>
-    public enum GroupRequestType
-    {
-        /// <summary>
-        /// A user is requesting to create a new group.
-        /// </summary>
-        NewGroup = 0,
-
-        /// <summary>
-        /// A user is requesting to join a group.
-        /// </summary>
-        JoinGroup = 1,
-
-        /// <summary>
-        /// A user is requesting to leave a group.
-        /// </summary>
-        LeaveGroup = 2,
-
-        /// <summary>
-        /// A user is requesting the list of available groups.
-        /// </summary>
-        ListGroups = 3,
-
-        /// <summary>
-        /// A user is sending a playback command to a group.
-        /// </summary>
-        Playback = 4
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestType.cs b/MediaBrowser.Model/SyncPlay/RequestType.cs
new file mode 100644
index 000000000..a6e397dcd
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestType.cs
@@ -0,0 +1,33 @@
+namespace MediaBrowser.Model.SyncPlay
+{
+    /// <summary>
+    /// Enum RequestType.
+    /// </summary>
+    public enum RequestType
+    {
+        /// <summary>
+        /// A user is requesting to create a new group.
+        /// </summary>
+        NewGroup = 0,
+
+        /// <summary>
+        /// A user is requesting to join a group.
+        /// </summary>
+        JoinGroup = 1,
+
+        /// <summary>
+        /// A user is requesting to leave a group.
+        /// </summary>
+        LeaveGroup = 2,
+
+        /// <summary>
+        /// A user is requesting the list of available groups.
+        /// </summary>
+        ListGroups = 3,
+
+        /// <summary>
+        /// A user is sending a playback command to a group.
+        /// </summary>
+        Playback = 4
+    }
+}
-- 
cgit v1.2.3


From 7e0ea296c383b9b9cd778bb12834c2a73df3d1ea Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 3 Dec 2020 10:43:44 +0100
Subject: Move request validation to auth policies

---
 .../SyncPlay/SyncPlayManager.cs                    | 62 ----------------------
 .../SyncPlayAccessPolicy/SyncPlayAccessHandler.cs  | 58 ++++++++++++++++++++
 .../SyncPlayAccessRequirement.cs                   | 33 ++++++++++++
 Jellyfin.Api/Constants/Policies.cs                 | 10 ++++
 Jellyfin.Api/Controllers/SyncPlayController.cs     |  3 +-
 .../Extensions/ApiServiceCollectionExtensions.cs   | 17 ++++++
 6 files changed, 120 insertions(+), 63 deletions(-)
 create mode 100644 Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
 create mode 100644 Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index 7e1f24f8c..0410048c4 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -102,11 +102,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void NewGroup(SessionInfo session, NewGroupRequest request, CancellationToken cancellationToken)
         {
-            if (!IsRequestValid(session, request))
-            {
-                return;
-            }
-
             // Locking required to access list of groups.
             lock (_groupsLock)
             {
@@ -132,11 +127,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void JoinGroup(SessionInfo session, JoinGroupRequest request, CancellationToken cancellationToken)
         {
-            if (!IsRequestValid(session, request))
-            {
-                return;
-            }
-
             var user = _userManager.GetUserById(session.UserId);
 
             // Locking required to access list of groups.
@@ -190,11 +180,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void LeaveGroup(SessionInfo session, LeaveGroupRequest request, CancellationToken cancellationToken)
         {
-            if (!IsRequestValid(session, request))
-            {
-                return;
-            }
-
             // Locking required to access list of groups.
             lock (_groupsLock)
             {
@@ -230,11 +215,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public List<GroupInfoDto> ListGroups(SessionInfo session, ListGroupsRequest request)
         {
-            if (!IsRequestValid(session, request))
-            {
-                return new List<GroupInfoDto>();
-            }
-
             var user = _userManager.GetUserById(session.UserId);
             List<GroupInfoDto> list = new List<GroupInfoDto>();
 
@@ -260,11 +240,6 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <inheritdoc />
         public void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken)
         {
-            if (!IsRequestValid(session, request))
-            {
-                return;
-            }
-
             IGroupController group;
             lock (_mapsLock)
             {
@@ -417,42 +392,5 @@ namespace Emby.Server.Implementations.SyncPlay
                 throw new InvalidOperationException("Session was in wrong group!");
             }
         }
-
-        /// <summary>
-        /// Checks if a given session is allowed to make a given request.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="request">The request.</param>
-        /// <returns><c>true</c> if the request is valid, <c>false</c> otherwise. Will return <c>false</c> also when session or request is null.</returns>
-        private bool IsRequestValid(SessionInfo session, ISyncPlayRequest request)
-        {
-            if (session == null || (request == null))
-            {
-                return false;
-            }
-
-            var user = _userManager.GetUserById(session.UserId);
-
-            if (user.SyncPlayAccess == SyncPlayAccess.None)
-            {
-                _logger.LogWarning("Session {SessionId} requested {RequestType} but does not have access to SyncPlay.", session.Id, request.Type);
-
-                // TODO: rename to a more generic error. Next PR will fix this.
-                var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.JoinGroupDenied, string.Empty);
-                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
-                return false;
-            }
-
-            if (request.Type.Equals(RequestType.NewGroup) && user.SyncPlayAccess != SyncPlayAccess.CreateAndJoinGroups)
-            {
-                _logger.LogWarning("Session {SessionId} does not have permission to create groups.", session.Id);
-
-                var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.CreateGroupDenied, string.Empty);
-                _sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None);
-                return false;
-            }
-
-            return true;
-        }
     }
 }
diff --git a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
new file mode 100644
index 000000000..2c3294523
--- /dev/null
+++ b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+using Jellyfin.Api.Helpers;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Library;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+
+namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
+{
+    /// <summary>
+    /// Default authorization handler.
+    /// </summary>
+    public class SyncPlayAccessHandler : BaseAuthorizationHandler<SyncPlayAccessRequirement>
+    {
+        private readonly IUserManager _userManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyncPlayAccessHandler"/> class.
+        /// </summary>
+        /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
+        /// <param name="networkManager">Instance of the <see cref="INetworkManager"/> interface.</param>
+        /// <param name="httpContextAccessor">Instance of the <see cref="IHttpContextAccessor"/> interface.</param>
+        public SyncPlayAccessHandler(
+            IUserManager userManager,
+            INetworkManager networkManager,
+            IHttpContextAccessor httpContextAccessor)
+            : base(userManager, networkManager, httpContextAccessor)
+        {
+            _userManager = userManager;
+        }
+
+        /// <inheritdoc />
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, SyncPlayAccessRequirement requirement)
+        {
+            if (!ValidateClaims(context.User))
+            {
+                context.Fail();
+                return Task.CompletedTask;
+            }
+
+            var userId = ClaimHelpers.GetUserId(context.User);
+            var user = _userManager.GetUserById(userId!.Value);
+
+            if ((requirement.RequiredAccess.HasValue && user.SyncPlayAccess == requirement.RequiredAccess)
+                || (user.SyncPlayAccess == SyncPlayAccess.JoinGroups || user.SyncPlayAccess == SyncPlayAccess.CreateAndJoinGroups))
+            {
+                context.Succeed(requirement);
+            }
+            else
+            {
+                context.Fail();
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs
new file mode 100644
index 000000000..7fcaf69f6
--- /dev/null
+++ b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs
@@ -0,0 +1,33 @@
+using Jellyfin.Data.Enums;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
+{
+    /// <summary>
+    /// The default authorization requirement.
+    /// </summary>
+    public class SyncPlayAccessRequirement : IAuthorizationRequirement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyncPlayAccessRequirement"/> class.
+        /// </summary>
+        /// <param name="requiredAccess">A value of <see cref="SyncPlayAccess"/>.</param>
+        public SyncPlayAccessRequirement(SyncPlayAccess requiredAccess)
+        {
+            RequiredAccess = requiredAccess;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyncPlayAccessRequirement"/> class.
+        /// </summary>
+        public SyncPlayAccessRequirement()
+        {
+            RequiredAccess = null;
+        }
+
+        /// <summary>
+        /// Gets the required SyncPlay access.
+        /// </summary>
+        public SyncPlayAccess? RequiredAccess { get; }
+    }
+}
diff --git a/Jellyfin.Api/Constants/Policies.cs b/Jellyfin.Api/Constants/Policies.cs
index 7d7767470..b35ceea1a 100644
--- a/Jellyfin.Api/Constants/Policies.cs
+++ b/Jellyfin.Api/Constants/Policies.cs
@@ -49,5 +49,15 @@ namespace Jellyfin.Api.Constants
         /// Policy name for escaping schedule controls or requiring first time setup.
         /// </summary>
         public const string FirstTimeSetupOrIgnoreParentalControl = "FirstTimeSetupOrIgnoreParentalControl";
+
+        /// <summary>
+        /// Policy name for requiring access to SyncPlay.
+        /// </summary>
+        public const string SyncPlayAccess = "SyncPlayAccess";
+
+        /// <summary>
+        /// Policy name for requiring group creation access to SyncPlay.
+        /// </summary>
+        public const string SyncPlayCreateGroupAccess = "SyncPlayCreateGroupAccess";
     }
 }
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index ed5ea3c8a..763940c73 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -20,7 +20,7 @@ namespace Jellyfin.Api.Controllers
     /// <summary>
     /// The sync play controller.
     /// </summary>
-    [Authorize(Policy = Policies.DefaultAuthorization)]
+    [Authorize(Policy = Policies.SyncPlayAccess)]
     public class SyncPlayController : BaseJellyfinApiController
     {
         private readonly ISessionManager _sessionManager;
@@ -51,6 +51,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("New")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayCreateGroupAccess)]
         public ActionResult SyncPlayCreateGroup(
             [FromBody, Required] NewGroupRequestBody requestData)
         {
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 6cb88c9f7..cdcc4bb86 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -15,9 +15,11 @@ using Jellyfin.Api.Auth.IgnoreParentalControlPolicy;
 using Jellyfin.Api.Auth.LocalAccessOrRequiresElevationPolicy;
 using Jellyfin.Api.Auth.LocalAccessPolicy;
 using Jellyfin.Api.Auth.RequiresElevationPolicy;
+using Jellyfin.Api.Auth.SyncPlayAccessPolicy;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Controllers;
 using Jellyfin.Api.ModelBinders;
+using Jellyfin.Data.Enums;
 using Jellyfin.Server.Configuration;
 using Jellyfin.Server.Filters;
 using Jellyfin.Server.Formatters;
@@ -58,6 +60,7 @@ namespace Jellyfin.Server.Extensions
             serviceCollection.AddSingleton<IAuthorizationHandler, LocalAccessHandler>();
             serviceCollection.AddSingleton<IAuthorizationHandler, LocalAccessOrRequiresElevationHandler>();
             serviceCollection.AddSingleton<IAuthorizationHandler, RequiresElevationHandler>();
+            serviceCollection.AddSingleton<IAuthorizationHandler, SyncPlayAccessHandler>();
             return serviceCollection.AddAuthorizationCore(options =>
             {
                 options.AddPolicy(
@@ -123,6 +126,20 @@ namespace Jellyfin.Server.Extensions
                         policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
                         policy.AddRequirements(new RequiresElevationRequirement());
                     });
+                options.AddPolicy(
+                    Policies.SyncPlayAccess,
+                    policy =>
+                    {
+                        policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
+                        policy.AddRequirements(new SyncPlayAccessRequirement());
+                    });
+                options.AddPolicy(
+                    Policies.SyncPlayCreateGroupAccess,
+                    policy =>
+                    {
+                        policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccess.CreateAndJoinGroups));
+                    });
             });
         }
 
-- 
cgit v1.2.3


From 389367fec80561548c6d0771242712f675f95319 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Thu, 3 Dec 2020 15:41:34 +0100
Subject: Rename 'track' into 'item' in SyncPlay

---
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 52 +++++++++++-----------
 .../SyncPlay/GroupStates/AbstractGroupState.cs     |  4 +-
 .../SyncPlay/GroupStates/IdleGroupState.cs         |  4 +-
 .../SyncPlay/GroupStates/PausedGroupState.cs       |  4 +-
 .../SyncPlay/GroupStates/PlayingGroupState.cs      |  4 +-
 .../SyncPlay/GroupStates/WaitingGroupState.cs      | 12 ++---
 MediaBrowser.Controller/SyncPlay/IGroupState.cs    | 12 ++---
 .../PlaybackRequests/NextItemGroupRequest.cs       | 36 +++++++++++++++
 .../PlaybackRequests/NextTrackGroupRequest.cs      | 36 ---------------
 .../PlaybackRequests/PreviousItemGroupRequest.cs   | 36 +++++++++++++++
 .../PlaybackRequests/PreviousTrackGroupRequest.cs  | 36 ---------------
 .../SyncPlay/PlayQueueUpdateReason.cs              |  4 +-
 MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs |  8 ++--
 .../SyncPlay/RequestBodies/NextItemRequestBody.cs  | 22 +++++++++
 .../SyncPlay/RequestBodies/NextTrackRequestBody.cs | 22 ---------
 .../RequestBodies/PreviousItemRequestBody.cs       | 22 +++++++++
 .../RequestBodies/PreviousTrackRequestBody.cs      | 22 ---------
 17 files changed, 168 insertions(+), 168 deletions(-)
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
 create mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
 delete mode 100644 MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
 create mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 763940c73..f8bbed9c4 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -108,14 +108,14 @@ namespace Jellyfin.Api.Controllers
         }
 
         /// <summary>
-        /// Request play in SyncPlay group.
+        /// Request to set new playlist in SyncPlay group.
         /// </summary>
         /// <param name="requestData">The new playlist to play in the group.</param>
-        /// <response code="204">Play request sent to all group members.</response>
+        /// <response code="204">Queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
-        [HttpPost("Play")]
+        [HttpPost("SetNewQueue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayPlay(
+        public ActionResult SyncPlaySetNewQueue(
             [FromBody, Required] PlayRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -131,7 +131,7 @@ namespace Jellyfin.Api.Controllers
         /// Request to change playlist item in SyncPlay group.
         /// </summary>
         /// <param name="requestData">The new item to play.</param>
-        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <response code="204">Queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetPlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -148,7 +148,7 @@ namespace Jellyfin.Api.Controllers
         /// Request to remove items from the playlist in SyncPlay group.
         /// </summary>
         /// <param name="requestData">The items to remove.</param>
-        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <response code="204">Queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("RemoveFromPlaylist")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -165,7 +165,7 @@ namespace Jellyfin.Api.Controllers
         /// Request to move an item in the playlist in SyncPlay group.
         /// </summary>
         /// <param name="requestData">The new position for the item.</param>
-        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <response code="204">Queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("MovePlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -182,7 +182,7 @@ namespace Jellyfin.Api.Controllers
         /// Request to queue items to the playlist of a SyncPlay group.
         /// </summary>
         /// <param name="requestData">The items to add.</param>
-        /// <response code="204">Queue update request sent to all group members.</response>
+        /// <response code="204">Queue update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -198,7 +198,7 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request unpause in SyncPlay group.
         /// </summary>
-        /// <response code="204">Unpause request sent to all group members.</response>
+        /// <response code="204">Unpause update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Unpause")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -213,7 +213,7 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request pause in SyncPlay group.
         /// </summary>
-        /// <response code="204">Pause request sent to all group members.</response>
+        /// <response code="204">Pause update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Pause")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -228,7 +228,7 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Request stop in SyncPlay group.
         /// </summary>
-        /// <response code="204">Stop request sent to all group members.</response>
+        /// <response code="204">Stop update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Stop")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -244,7 +244,7 @@ namespace Jellyfin.Api.Controllers
         /// Request seek in SyncPlay group.
         /// </summary>
         /// <param name="requestData">The new playback position.</param>
-        /// <response code="204">Seek request sent to all group members.</response>
+        /// <response code="204">Seek update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Seek")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -317,35 +317,35 @@ namespace Jellyfin.Api.Controllers
         }
 
         /// <summary>
-        /// Request next track in SyncPlay group.
+        /// Request next item in SyncPlay group.
         /// </summary>
-        /// <param name="requestData">The current track information.</param>
-        /// <response code="204">Next track request sent to all group members.</response>
+        /// <param name="requestData">The current item information.</param>
+        /// <response code="204">Next item update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
-        [HttpPost("NextTrack")]
+        [HttpPost("NextItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayNextTrack(
-            [FromBody, Required] NextTrackRequestBody requestData)
+        public ActionResult SyncPlayNextItem(
+            [FromBody, Required] NextItemRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new NextTrackGroupRequest(requestData.PlaylistItemId);
+            var syncPlayRequest = new NextItemGroupRequest(requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
 
         /// <summary>
-        /// Request previous track in SyncPlay group.
+        /// Request previous item in SyncPlay group.
         /// </summary>
-        /// <param name="requestData">The current track information.</param>
-        /// <response code="204">Previous track request sent to all group members.</response>
+        /// <param name="requestData">The current item information.</param>
+        /// <response code="204">Previous item update sent to all group members.</response>
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
-        [HttpPost("PreviousTrack")]
+        [HttpPost("PreviousItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public ActionResult SyncPlayPreviousTrack(
-            [FromBody, Required] PreviousTrackRequestBody requestData)
+        public ActionResult SyncPlayPreviousItem(
+            [FromBody, Required] PreviousItemRequestBody requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
-            var syncPlayRequest = new PreviousTrackGroupRequest(requestData.PlaylistItemId);
+            var syncPlayRequest = new PreviousItemGroupRequest(requestData.PlaylistItemId);
             _syncPlayManager.HandleRequest(currentSession, syncPlayRequest, CancellationToken.None);
             return NoContent();
         }
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
index 0b15e3ae4..5e3d4a252 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
@@ -157,13 +157,13 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             UnhandledRequest(request);
         }
 
         /// <inheritdoc />
-        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             UnhandledRequest(request);
         }
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
index 7730a298c..8074d5a96 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
@@ -102,7 +102,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
index 90411f61b..28e5db950 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
@@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
@@ -154,7 +154,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
index aab87d9c3..278a0af08 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Change state.
             var waitingState = new WaitingGroupState(LoggerFactory);
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
index fefb8067f..f5f603c29 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
@@ -560,7 +560,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Save state if first event.
             if (!InitialStateSet)
@@ -582,7 +582,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             if (newItem)
             {
                 // Send playing-queue update.
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextTrack);
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextItem);
                 var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
                 context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
 
@@ -601,12 +601,12 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                 context.SetState(newState);
 
-                _logger.LogDebug("No next track available in group {GroupId}.", context.GroupId.ToString());
+                _logger.LogDebug("No next item available in group {GroupId}.", context.GroupId.ToString());
             }
         }
 
         /// <inheritdoc />
-        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
+        public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
         {
             // Save state if first event.
             if (!InitialStateSet)
@@ -628,7 +628,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
             if (newItem)
             {
                 // Send playing-queue update.
-                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousTrack);
+                var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousItem);
                 var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
                 context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
 
@@ -647,7 +647,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
 
                 context.SetState(newState);
 
-                _logger.LogDebug("No previous track available in group {GroupId}.", context.GroupId.ToString());
+                _logger.LogDebug("No previous item available in group {GroupId}.", context.GroupId.ToString());
             }
         }
 
diff --git a/MediaBrowser.Controller/SyncPlay/IGroupState.cs b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
index 0028823b4..89a8e2e2e 100644
--- a/MediaBrowser.Controller/SyncPlay/IGroupState.cs
+++ b/MediaBrowser.Controller/SyncPlay/IGroupState.cs
@@ -155,24 +155,24 @@ namespace MediaBrowser.Controller.SyncPlay
         void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Handles a next-track request from a session. Context's state can change.
+        /// Handles a next-item request from a session. Context's state can change.
         /// </summary>
         /// <param name="context">The context of the state.</param>
         /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The next-track request.</param>
+        /// <param name="request">The next-item request.</param>
         /// <param name="session">The session.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Handles a previous-track request from a session. Context's state can change.
+        /// Handles a previous-item request from a session. Context's state can change.
         /// </summary>
         /// <param name="context">The context of the state.</param>
         /// <param name="prevState">The previous state.</param>
-        /// <param name="request">The previous-track request.</param>
+        /// <param name="request">The previous-item request.</param>
         /// <param name="session">The session.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
+        void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
 
         /// <summary>
         /// Handles a set-repeat-mode request from a session. Context's state should not change.
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
new file mode 100644
index 000000000..ab60265a6
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class NextItemGroupRequest.
+    /// </summary>
+    public class NextItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NextItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public NextItemGroupRequest(string playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
deleted file mode 100644
index 73b7d0908..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-
-namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
-{
-    /// <summary>
-    /// Class NextTrackGroupRequest.
-    /// </summary>
-    public class NextTrackGroupRequest : AbstractPlaybackRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NextTrackGroupRequest"/> class.
-        /// </summary>
-        /// <param name="playlistItemId">The playing item identifier.</param>
-        public NextTrackGroupRequest(string playlistItemId)
-        {
-            PlaylistItemId = playlistItemId;
-        }
-
-        /// <summary>
-        /// Gets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; }
-
-        /// <inheritdoc />
-        public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextTrack;
-
-        /// <inheritdoc />
-        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.Type, this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
new file mode 100644
index 000000000..445c5fce6
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class PreviousItemGroupRequest.
+    /// </summary>
+    public class PreviousItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public PreviousItemGroupRequest(string playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(context, state.Type, this, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
deleted file mode 100644
index 4c70beb0e..000000000
--- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.SyncPlay;
-
-namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
-{
-    /// <summary>
-    /// Class PreviousTrackGroupRequest.
-    /// </summary>
-    public class PreviousTrackGroupRequest : AbstractPlaybackRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PreviousTrackGroupRequest"/> class.
-        /// </summary>
-        /// <param name="playlistItemId">The playing item identifier.</param>
-        public PreviousTrackGroupRequest(string playlistItemId)
-        {
-            PlaylistItemId = playlistItemId;
-        }
-
-        /// <summary>
-        /// Gets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; }
-
-        /// <inheritdoc />
-        public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousTrack;
-
-        /// <inheritdoc />
-        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
-        {
-            state.HandleRequest(context, state.Type, this, session, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs b/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
index e78940fe6..b609f4b1b 100644
--- a/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
+++ b/MediaBrowser.Model/SyncPlay/PlayQueueUpdateReason.cs
@@ -38,12 +38,12 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// A user is requesting the next item in queue.
         /// </summary>
-        NextTrack = 6,
+        NextItem = 6,
 
         /// <summary>
         /// A user is requesting the previous item in queue.
         /// </summary>
-        PreviousTrack = 7,
+        PreviousItem = 7,
 
         /// <summary>
         /// A user is changing repeat mode.
diff --git a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
index 4809dc44f..4429623dd 100644
--- a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
@@ -61,14 +61,14 @@ namespace MediaBrowser.Model.SyncPlay
         Ready = 10,
 
         /// <summary>
-        /// A user is requesting next track in playlist.
+        /// A user is requesting next item in playlist.
         /// </summary>
-        NextTrack = 11,
+        NextItem = 11,
 
         /// <summary>
-        /// A user is requesting previous track in playlist.
+        /// A user is requesting previous item in playlist.
         /// </summary>
-        PreviousTrack = 12,
+        PreviousItem = 12,
 
         /// <summary>
         /// A user is setting the repeat mode.
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
new file mode 100644
index 000000000..39ce75dc1
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class NextItemRequestBody.
+    /// </summary>
+    public class NextItemRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NextItemRequestBody"/> class.
+        /// </summary>
+        public NextItemRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
deleted file mode 100644
index 1d8d135cb..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/NextTrackRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class NextTrackRequestBody.
-    /// </summary>
-    public class NextTrackRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NextTrackRequestBody"/> class.
-        /// </summary>
-        public NextTrackRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
new file mode 100644
index 000000000..671a7291c
--- /dev/null
+++ b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.SyncPlay.RequestBodies
+{
+    /// <summary>
+    /// Class PreviousItemRequestBody.
+    /// </summary>
+    public class PreviousItemRequestBody
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousItemRequestBody"/> class.
+        /// </summary>
+        public PreviousItemRequestBody()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs
deleted file mode 100644
index 95ebeeb90..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousTrackRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class PreviousTrackRequestBody.
-    /// </summary>
-    public class PreviousTrackRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PreviousTrackRequestBody"/> class.
-        /// </summary>
-        public PreviousTrackRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
-- 
cgit v1.2.3


From 7169c0a22da8147e1fd00f6568e41d235123809f Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Thu, 3 Dec 2020 19:01:57 +0100
Subject: Move SyncPlay request DTOs to proper namespace

---
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 34 +++++++++---------
 .../Models/SyncPlayDtos/BufferRequestDto.cs        | 42 ++++++++++++++++++++++
 .../Models/SyncPlayDtos/IgnoreWaitRequestDto.cs    | 14 ++++++++
 .../Models/SyncPlayDtos/JoinGroupRequestDto.cs     | 16 +++++++++
 .../SyncPlayDtos/MovePlaylistItemRequestDto.cs     | 28 +++++++++++++++
 .../Models/SyncPlayDtos/NewGroupRequestDto.cs      | 22 ++++++++++++
 .../Models/SyncPlayDtos/NextItemRequestDto.cs      | 22 ++++++++++++
 Jellyfin.Api/Models/SyncPlayDtos/PingRequestDto.cs | 14 ++++++++
 Jellyfin.Api/Models/SyncPlayDtos/PlayRequestDto.cs | 37 +++++++++++++++++++
 .../Models/SyncPlayDtos/PreviousItemRequestDto.cs  | 22 ++++++++++++
 .../Models/SyncPlayDtos/QueueRequestDto.cs         | 32 +++++++++++++++++
 .../Models/SyncPlayDtos/ReadyRequestDto.cs         | 42 ++++++++++++++++++++++
 .../SyncPlayDtos/RemoveFromPlaylistRequestDto.cs   | 25 +++++++++++++
 Jellyfin.Api/Models/SyncPlayDtos/SeekRequestDto.cs | 14 ++++++++
 .../SyncPlayDtos/SetPlaylistItemRequestDto.cs      | 22 ++++++++++++
 .../Models/SyncPlayDtos/SetRepeatModeRequestDto.cs | 16 +++++++++
 .../SyncPlayDtos/SetShuffleModeRequestDto.cs       | 16 +++++++++
 .../SyncPlay/ISyncPlayManager.cs                   |  1 -
 .../SyncPlay/RequestBodies/BufferRequestBody.cs    | 42 ----------------------
 .../RequestBodies/IgnoreWaitRequestBody.cs         | 14 --------
 .../SyncPlay/RequestBodies/JoinGroupRequestBody.cs | 16 ---------
 .../RequestBodies/MovePlaylistItemRequestBody.cs   | 28 ---------------
 .../SyncPlay/RequestBodies/NewGroupRequestBody.cs  | 22 ------------
 .../SyncPlay/RequestBodies/NextItemRequestBody.cs  | 22 ------------
 .../SyncPlay/RequestBodies/PingRequestBody.cs      | 14 --------
 .../SyncPlay/RequestBodies/PlayRequestBody.cs      | 37 -------------------
 .../RequestBodies/PreviousItemRequestBody.cs       | 22 ------------
 .../SyncPlay/RequestBodies/QueueRequestBody.cs     | 31 ----------------
 .../SyncPlay/RequestBodies/ReadyRequestBody.cs     | 42 ----------------------
 .../RequestBodies/RemoveFromPlaylistRequestBody.cs | 25 -------------
 .../SyncPlay/RequestBodies/SeekRequestBody.cs      | 14 --------
 .../RequestBodies/SetPlaylistItemRequestBody.cs    | 22 ------------
 .../RequestBodies/SetRepeatModeRequestBody.cs      | 14 --------
 .../RequestBodies/SetShuffleModeRequestBody.cs     | 14 --------
 34 files changed, 401 insertions(+), 397 deletions(-)
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/BufferRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/IgnoreWaitRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/JoinGroupRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/MovePlaylistItemRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/NewGroupRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/NextItemRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/PingRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/PlayRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/PreviousItemRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/QueueRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/ReadyRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/RemoveFromPlaylistRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/SeekRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/SetPlaylistItemRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/SetRepeatModeRequestDto.cs
 create mode 100644 Jellyfin.Api/Models/SyncPlayDtos/SetShuffleModeRequestDto.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
 delete mode 100644 MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index f8bbed9c4..32e020c8a 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -4,13 +4,13 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
+using Jellyfin.Api.Models.SyncPlayDtos;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay;
 using MediaBrowser.Controller.SyncPlay.PlaybackRequests;
 using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Model.SyncPlay.RequestBodies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -53,7 +53,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         [Authorize(Policy = Policies.SyncPlayCreateGroupAccess)]
         public ActionResult SyncPlayCreateGroup(
-            [FromBody, Required] NewGroupRequestBody requestData)
+            [FromBody, Required] NewGroupRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new NewGroupRequest(requestData.GroupName);
@@ -70,7 +70,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Join")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayJoinGroup(
-            [FromBody, Required] JoinGroupRequestBody requestData)
+            [FromBody, Required] JoinGroupRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new JoinGroupRequest(requestData.GroupId);
@@ -116,7 +116,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetNewQueue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetNewQueue(
-            [FromBody, Required] PlayRequestBody requestData)
+            [FromBody, Required] PlayRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new PlayGroupRequest(
@@ -136,7 +136,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetPlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetPlaylistItem(
-            [FromBody, Required] SetPlaylistItemRequestBody requestData)
+            [FromBody, Required] SetPlaylistItemRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new SetPlaylistItemGroupRequest(requestData.PlaylistItemId);
@@ -153,7 +153,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("RemoveFromPlaylist")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayRemoveFromPlaylist(
-            [FromBody, Required] RemoveFromPlaylistRequestBody requestData)
+            [FromBody, Required] RemoveFromPlaylistRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new RemoveFromPlaylistGroupRequest(requestData.PlaylistItemIds);
@@ -170,7 +170,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("MovePlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayMovePlaylistItem(
-            [FromBody, Required] MovePlaylistItemRequestBody requestData)
+            [FromBody, Required] MovePlaylistItemRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new MovePlaylistItemGroupRequest(requestData.PlaylistItemId, requestData.NewIndex);
@@ -187,7 +187,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayQueue(
-            [FromBody, Required] QueueRequestBody requestData)
+            [FromBody, Required] QueueRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new QueueGroupRequest(requestData.ItemIds, requestData.Mode);
@@ -249,7 +249,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Seek")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySeek(
-            [FromBody, Required] SeekRequestBody requestData)
+            [FromBody, Required] SeekRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new SeekGroupRequest(requestData.PositionTicks);
@@ -266,7 +266,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Buffering")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayBuffering(
-            [FromBody, Required] BufferRequestBody requestData)
+            [FromBody, Required] BufferRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new BufferGroupRequest(
@@ -287,7 +287,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Ready")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayReady(
-            [FromBody, Required] ReadyRequestBody requestData)
+            [FromBody, Required] ReadyRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new ReadyGroupRequest(
@@ -308,7 +308,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetIgnoreWait")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetIgnoreWait(
-            [FromBody, Required] IgnoreWaitRequestBody requestData)
+            [FromBody, Required] IgnoreWaitRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new IgnoreWaitGroupRequest(requestData.IgnoreWait);
@@ -325,7 +325,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("NextItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayNextItem(
-            [FromBody, Required] NextItemRequestBody requestData)
+            [FromBody, Required] NextItemRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new NextItemGroupRequest(requestData.PlaylistItemId);
@@ -342,7 +342,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("PreviousItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPreviousItem(
-            [FromBody, Required] PreviousItemRequestBody requestData)
+            [FromBody, Required] PreviousItemRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new PreviousItemGroupRequest(requestData.PlaylistItemId);
@@ -359,7 +359,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetRepeatMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetRepeatMode(
-            [FromBody, Required] SetRepeatModeRequestBody requestData)
+            [FromBody, Required] SetRepeatModeRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new SetRepeatModeGroupRequest(requestData.Mode);
@@ -376,7 +376,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("SetShuffleMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlaySetShuffleMode(
-            [FromBody, Required] SetShuffleModeRequestBody requestData)
+            [FromBody, Required] SetShuffleModeRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new SetShuffleModeGroupRequest(requestData.Mode);
@@ -393,7 +393,7 @@ namespace Jellyfin.Api.Controllers
         [HttpPost("Ping")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SyncPlayPing(
-            [FromBody, Required] PingRequestBody requestData)
+            [FromBody, Required] PingRequestDto requestData)
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
             var syncPlayRequest = new PingGroupRequest(requestData.Ping);
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/BufferRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/BufferRequestDto.cs
new file mode 100644
index 000000000..cafc400c9
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/BufferRequestDto.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class BufferRequestDto.
+    /// </summary>
+    public class BufferRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BufferRequestDto"/> class.
+        /// </summary>
+        public BufferRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/IgnoreWaitRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/IgnoreWaitRequestDto.cs
new file mode 100644
index 000000000..4c30b7be4
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/IgnoreWaitRequestDto.cs
@@ -0,0 +1,14 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class IgnoreWaitRequestDto.
+    /// </summary>
+    public class IgnoreWaitRequestDto
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the client should be ignored.
+        /// </summary>
+        /// <value>The client group-wait status.</value>
+        public bool IgnoreWait { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/JoinGroupRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/JoinGroupRequestDto.cs
new file mode 100644
index 000000000..ed97b8d6a
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/JoinGroupRequestDto.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class JoinGroupRequestDto.
+    /// </summary>
+    public class JoinGroupRequestDto
+    {
+        /// <summary>
+        /// Gets or sets the group identifier.
+        /// </summary>
+        /// <value>The identifier of the group to join.</value>
+        public Guid GroupId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/MovePlaylistItemRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/MovePlaylistItemRequestDto.cs
new file mode 100644
index 000000000..9e9c0b1ea
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/MovePlaylistItemRequestDto.cs
@@ -0,0 +1,28 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class MovePlaylistItemRequestDto.
+    /// </summary>
+    public class MovePlaylistItemRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovePlaylistItemRequestDto"/> class.
+        /// </summary>
+        public MovePlaylistItemRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifier of the item.
+        /// </summary>
+        /// <value>The playlist identifier of the item.</value>
+        public string PlaylistItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new position.
+        /// </summary>
+        /// <value>The new position.</value>
+        public int NewIndex { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/NewGroupRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/NewGroupRequestDto.cs
new file mode 100644
index 000000000..441d7be36
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/NewGroupRequestDto.cs
@@ -0,0 +1,22 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class NewGroupRequestDto.
+    /// </summary>
+    public class NewGroupRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NewGroupRequestDto"/> class.
+        /// </summary>
+        public NewGroupRequestDto()
+        {
+            GroupName = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the group name.
+        /// </summary>
+        /// <value>The name of the new group.</value>
+        public string GroupName { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/NextItemRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/NextItemRequestDto.cs
new file mode 100644
index 000000000..aa67954e7
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/NextItemRequestDto.cs
@@ -0,0 +1,22 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class NextItemRequestDto.
+    /// </summary>
+    public class NextItemRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NextItemRequestDto"/> class.
+        /// </summary>
+        public NextItemRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/PingRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/PingRequestDto.cs
new file mode 100644
index 000000000..c4ac06856
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/PingRequestDto.cs
@@ -0,0 +1,14 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class PingRequestDto.
+    /// </summary>
+    public class PingRequestDto
+    {
+        /// <summary>
+        /// Gets or sets the ping time.
+        /// </summary>
+        /// <value>The ping time.</value>
+        public long Ping { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/PlayRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/PlayRequestDto.cs
new file mode 100644
index 000000000..844388cd9
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/PlayRequestDto.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class PlayRequestDto.
+    /// </summary>
+    public class PlayRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayRequestDto"/> class.
+        /// </summary>
+        public PlayRequestDto()
+        {
+            PlayingQueue = Array.Empty<Guid>();
+        }
+
+        /// <summary>
+        /// Gets or sets the playing queue.
+        /// </summary>
+        /// <value>The playing queue.</value>
+        public IReadOnlyList<Guid> PlayingQueue { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position of the playing item in the queue.
+        /// </summary>
+        /// <value>The playing item position.</value>
+        public int PlayingItemPosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start position ticks.
+        /// </summary>
+        /// <value>The start position ticks.</value>
+        public long StartPositionTicks { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/PreviousItemRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/PreviousItemRequestDto.cs
new file mode 100644
index 000000000..b23d4dee0
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/PreviousItemRequestDto.cs
@@ -0,0 +1,22 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class PreviousItemRequestDto.
+    /// </summary>
+    public class PreviousItemRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousItemRequestDto"/> class.
+        /// </summary>
+        public PreviousItemRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/QueueRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/QueueRequestDto.cs
new file mode 100644
index 000000000..2b187f443
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/QueueRequestDto.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Model.SyncPlay;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class QueueRequestDto.
+    /// </summary>
+    public class QueueRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueueRequestDto"/> class.
+        /// </summary>
+        public QueueRequestDto()
+        {
+            ItemIds = Array.Empty<Guid>();
+        }
+
+        /// <summary>
+        /// Gets or sets the items to enqueue.
+        /// </summary>
+        /// <value>The items to enqueue.</value>
+        public IReadOnlyList<Guid> ItemIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mode in which to add the new items.
+        /// </summary>
+        /// <value>The enqueue mode.</value>
+        public GroupQueueMode Mode { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/ReadyRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/ReadyRequestDto.cs
new file mode 100644
index 000000000..0155d5249
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/ReadyRequestDto.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class ReadyRequest.
+    /// </summary>
+    public class ReadyRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReadyRequestDto"/> class.
+        /// </summary>
+        public ReadyRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/RemoveFromPlaylistRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/RemoveFromPlaylistRequestDto.cs
new file mode 100644
index 000000000..facb809fc
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/RemoveFromPlaylistRequestDto.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class RemoveFromPlaylistRequestDto.
+    /// </summary>
+    public class RemoveFromPlaylistRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveFromPlaylistRequestDto"/> class.
+        /// </summary>
+        public RemoveFromPlaylistRequestDto()
+        {
+            PlaylistItemIds = Array.Empty<string>();
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifiers ot the items.
+        /// </summary>
+        /// <value>The playlist identifiers ot the items.</value>
+        public IReadOnlyList<string> PlaylistItemIds { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/SeekRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/SeekRequestDto.cs
new file mode 100644
index 000000000..b9af0be7f
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/SeekRequestDto.cs
@@ -0,0 +1,14 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class SeekRequestDto.
+    /// </summary>
+    public class SeekRequestDto
+    {
+        /// <summary>
+        /// Gets or sets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/SetPlaylistItemRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/SetPlaylistItemRequestDto.cs
new file mode 100644
index 000000000..344085871
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/SetPlaylistItemRequestDto.cs
@@ -0,0 +1,22 @@
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class SetPlaylistItemRequestDto.
+    /// </summary>
+    public class SetPlaylistItemRequestDto
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetPlaylistItemRequestDto"/> class.
+        /// </summary>
+        public SetPlaylistItemRequestDto()
+        {
+            PlaylistItemId = string.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the playlist identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist identifier of the playing item.</value>
+        public string PlaylistItemId { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/SetRepeatModeRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/SetRepeatModeRequestDto.cs
new file mode 100644
index 000000000..e748fc3e0
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/SetRepeatModeRequestDto.cs
@@ -0,0 +1,16 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class SetRepeatModeRequestDto.
+    /// </summary>
+    public class SetRepeatModeRequestDto
+    {
+        /// <summary>
+        /// Gets or sets the repeat mode.
+        /// </summary>
+        /// <value>The repeat mode.</value>
+        public GroupRepeatMode Mode { get; set; }
+    }
+}
diff --git a/Jellyfin.Api/Models/SyncPlayDtos/SetShuffleModeRequestDto.cs b/Jellyfin.Api/Models/SyncPlayDtos/SetShuffleModeRequestDto.cs
new file mode 100644
index 000000000..0e427f4a4
--- /dev/null
+++ b/Jellyfin.Api/Models/SyncPlayDtos/SetShuffleModeRequestDto.cs
@@ -0,0 +1,16 @@
+using MediaBrowser.Model.SyncPlay;
+
+namespace Jellyfin.Api.Models.SyncPlayDtos
+{
+    /// <summary>
+    /// Class SetShuffleModeRequestDto.
+    /// </summary>
+    public class SetShuffleModeRequestDto
+    {
+        /// <summary>
+        /// Gets or sets the shuffle mode.
+        /// </summary>
+        /// <value>The shuffle mode.</value>
+        public GroupShuffleMode Mode { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index 146e4351d..d0244563a 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.SyncPlay.Requests;
 using MediaBrowser.Model.SyncPlay;
-using MediaBrowser.Model.SyncPlay.RequestBodies;
 
 namespace MediaBrowser.Controller.SyncPlay
 {
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
deleted file mode 100644
index 09ca712e5..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/BufferRequestBody.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class BufferRequestBody.
-    /// </summary>
-    public class BufferRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BufferRequestBody"/> class.
-        /// </summary>
-        public BufferRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets when the request has been made by the client.
-        /// </summary>
-        /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the client playback is unpaused.
-        /// </summary>
-        /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
deleted file mode 100644
index 22407e88e..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/IgnoreWaitRequestBody.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class IgnoreWaitRequestBody.
-    /// </summary>
-    public class IgnoreWaitRequestBody
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the client should be ignored.
-        /// </summary>
-        /// <value>The client group-wait status.</value>
-        public bool IgnoreWait { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
deleted file mode 100644
index 2cec7bdc2..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/JoinGroupRequestBody.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class JoinGroupRequestBody.
-    /// </summary>
-    public class JoinGroupRequestBody
-    {
-        /// <summary>
-        /// Gets or sets the group identifier.
-        /// </summary>
-        /// <value>The identifier of the group to join.</value>
-        public Guid GroupId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
deleted file mode 100644
index d18eb68ff..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/MovePlaylistItemRequestBody.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class MovePlaylistItemRequestBody.
-    /// </summary>
-    public class MovePlaylistItemRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MovePlaylistItemRequestBody"/> class.
-        /// </summary>
-        public MovePlaylistItemRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playlist identifier of the item.
-        /// </summary>
-        /// <value>The playlist identifier of the item.</value>
-        public string PlaylistItemId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the new position.
-        /// </summary>
-        /// <value>The new position.</value>
-        public int NewIndex { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
deleted file mode 100644
index 1a85d276b..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/NewGroupRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class NewGroupRequestBody.
-    /// </summary>
-    public class NewGroupRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NewGroupRequestBody"/> class.
-        /// </summary>
-        public NewGroupRequestBody()
-        {
-            GroupName = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the group name.
-        /// </summary>
-        /// <value>The name of the new group.</value>
-        public string GroupName { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
deleted file mode 100644
index 39ce75dc1..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/NextItemRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class NextItemRequestBody.
-    /// </summary>
-    public class NextItemRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NextItemRequestBody"/> class.
-        /// </summary>
-        public NextItemRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
deleted file mode 100644
index f08015bc4..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/PingRequestBody.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class PingRequestBody.
-    /// </summary>
-    public class PingRequestBody
-    {
-        /// <summary>
-        /// Gets or sets the ping time.
-        /// </summary>
-        /// <value>The ping time.</value>
-        public long Ping { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
deleted file mode 100644
index 97ec95c62..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/PlayRequestBody.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class PlayRequestBody.
-    /// </summary>
-    public class PlayRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlayRequestBody"/> class.
-        /// </summary>
-        public PlayRequestBody()
-        {
-            PlayingQueue = Array.Empty<Guid>();
-        }
-
-        /// <summary>
-        /// Gets or sets the playing queue.
-        /// </summary>
-        /// <value>The playing queue.</value>
-        public IReadOnlyList<Guid> PlayingQueue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position of the playing item in the queue.
-        /// </summary>
-        /// <value>The playing item position.</value>
-        public int PlayingItemPosition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start position ticks.
-        /// </summary>
-        /// <value>The start position ticks.</value>
-        public long StartPositionTicks { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
deleted file mode 100644
index 671a7291c..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/PreviousItemRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class PreviousItemRequestBody.
-    /// </summary>
-    public class PreviousItemRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PreviousItemRequestBody"/> class.
-        /// </summary>
-        public PreviousItemRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playing item identifier.
-        /// </summary>
-        /// <value>The playing item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
deleted file mode 100644
index 1afc61dd4..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/QueueRequestBody.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class QueueRequestBody.
-    /// </summary>
-    public class QueueRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueueRequestBody"/> class.
-        /// </summary>
-        public QueueRequestBody()
-        {
-            ItemIds = Array.Empty<Guid>();
-        }
-
-        /// <summary>
-        /// Gets or sets the items to enqueue.
-        /// </summary>
-        /// <value>The items to enqueue.</value>
-        public IReadOnlyList<Guid> ItemIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mode in which to add the new items.
-        /// </summary>
-        /// <value>The enqueue mode.</value>
-        public GroupQueueMode Mode { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
deleted file mode 100644
index 359186e78..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/ReadyRequestBody.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class ReadyRequest.
-    /// </summary>
-    public class ReadyRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadyRequestBody"/> class.
-        /// </summary>
-        public ReadyRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets when the request has been made by the client.
-        /// </summary>
-        /// <value>The date of the request.</value>
-        public DateTime When { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the client playback is unpaused.
-        /// </summary>
-        /// <value>The client playback status.</value>
-        public bool IsPlaying { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playlist item identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist item identifier.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
deleted file mode 100644
index a2b617cd0..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/RemoveFromPlaylistRequestBody.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class RemoveFromPlaylistRequestBody.
-    /// </summary>
-    public class RemoveFromPlaylistRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveFromPlaylistRequestBody"/> class.
-        /// </summary>
-        public RemoveFromPlaylistRequestBody()
-        {
-            PlaylistItemIds = Array.Empty<string>();
-        }
-
-        /// <summary>
-        /// Gets or sets the playlist identifiers ot the items.
-        /// </summary>
-        /// <value>The playlist identifiers ot the items.</value>
-        public IReadOnlyList<string> PlaylistItemIds { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
deleted file mode 100644
index 689183bb6..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/SeekRequestBody.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class SeekRequestBody.
-    /// </summary>
-    public class SeekRequestBody
-    {
-        /// <summary>
-        /// Gets or sets the position ticks.
-        /// </summary>
-        /// <value>The position ticks.</value>
-        public long PositionTicks { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
deleted file mode 100644
index abe66c479..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/SetPlaylistItemRequestBody.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class SetPlaylistItemRequestBody.
-    /// </summary>
-    public class SetPlaylistItemRequestBody
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetPlaylistItemRequestBody"/> class.
-        /// </summary>
-        public SetPlaylistItemRequestBody()
-        {
-            PlaylistItemId = string.Empty;
-        }
-
-        /// <summary>
-        /// Gets or sets the playlist identifier of the playing item.
-        /// </summary>
-        /// <value>The playlist identifier of the playing item.</value>
-        public string PlaylistItemId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
deleted file mode 100644
index 6de5415ca..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/SetRepeatModeRequestBody.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class SetRepeatModeRequestBody.
-    /// </summary>
-    public class SetRepeatModeRequestBody
-    {
-        /// <summary>
-        /// Gets or sets the repeat mode.
-        /// </summary>
-        /// <value>The repeat mode.</value>
-        public GroupRepeatMode Mode { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs b/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs
deleted file mode 100644
index 867cb938d..000000000
--- a/MediaBrowser.Model/SyncPlay/RequestBodies/SetShuffleModeRequestBody.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MediaBrowser.Model.SyncPlay.RequestBodies
-{
-    /// <summary>
-    /// Class SetShuffleModeRequestBody.
-    /// </summary>
-    public class SetShuffleModeRequestBody
-    {
-        /// <summary>
-        /// Gets or sets the shuffle mode.
-        /// </summary>
-        /// <value>The shuffle mode.</value>
-        public GroupShuffleMode Mode { get; set; }
-    }
-}
-- 
cgit v1.2.3


From 23473ef8fb2fb7bb1004f1748d67e0ff03354765 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Fri, 4 Dec 2020 22:03:35 +0100
Subject: Fix access policies to SyncPlay

---
 Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs | 2 +-
 Jellyfin.Api/Controllers/SyncPlayController.cs                  | 2 ++
 Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
index 2c3294523..b5932ea6b 100644
--- a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
+++ b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
@@ -43,7 +43,7 @@ namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
             var user = _userManager.GetUserById(userId!.Value);
 
             if ((requirement.RequiredAccess.HasValue && user.SyncPlayAccess == requirement.RequiredAccess)
-                || (user.SyncPlayAccess == SyncPlayAccess.JoinGroups || user.SyncPlayAccess == SyncPlayAccess.CreateAndJoinGroups))
+                || user.SyncPlayAccess == SyncPlayAccess.CreateAndJoinGroups)
             {
                 context.Succeed(requirement);
             }
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 32e020c8a..471c9180d 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -69,6 +69,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Join")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayAccess)]
         public ActionResult SyncPlayJoinGroup(
             [FromBody, Required] JoinGroupRequestDto requestData)
         {
@@ -100,6 +101,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>An <see cref="IEnumerable{GroupInfoView}"/> containing the available SyncPlay groups.</returns>
         [HttpGet("List")]
         [ProducesResponseType(StatusCodes.Status200OK)]
+        [Authorize(Policy = Policies.SyncPlayAccess)]
         public ActionResult<IEnumerable<GroupInfoDto>> SyncPlayGetGroups()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index cdcc4bb86..7c4d341df 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -131,7 +131,7 @@ namespace Jellyfin.Server.Extensions
                     policy =>
                     {
                         policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
-                        policy.AddRequirements(new SyncPlayAccessRequirement());
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccess.JoinGroups));
                     });
                 options.AddPolicy(
                     Policies.SyncPlayCreateGroupAccess,
-- 
cgit v1.2.3


From 499f3ee9505437a5b38c315201ccc832561be715 Mon Sep 17 00:00:00 2001
From: Ionut Andrei Oanca <oancaionutandrei@gmail.com>
Date: Mon, 7 Dec 2020 10:33:15 +0100
Subject: Update authorization policies for SyncPlay

---
 .../SyncPlay/SyncPlayManager.cs                    | 44 ++++++++++++++++++
 .../SyncPlayAccessPolicy/SyncPlayAccessHandler.cs  | 53 ++++++++++++++++++++--
 .../SyncPlayAccessRequirement.cs                   | 14 ++----
 Jellyfin.Api/Constants/Policies.cs                 | 18 ++++++--
 Jellyfin.Api/Controllers/SyncPlayController.cs     | 25 ++++++++--
 Jellyfin.Data/Entities/User.cs                     |  4 +-
 Jellyfin.Data/Enums/SyncPlayAccess.cs              | 23 ----------
 .../Enums/SyncPlayAccessRequirementType.cs         | 28 ++++++++++++
 Jellyfin.Data/Enums/SyncPlayUserAccessType.cs      | 23 ++++++++++
 .../Extensions/ApiServiceCollectionExtensions.cs   | 22 +++++++--
 .../SyncPlay/ISyncPlayManager.cs                   |  7 +++
 MediaBrowser.Model/Users/UserPolicy.cs             |  4 +-
 12 files changed, 212 insertions(+), 53 deletions(-)
 delete mode 100644 Jellyfin.Data/Enums/SyncPlayAccess.cs
 create mode 100644 Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
 create mode 100644 Jellyfin.Data/Enums/SyncPlayUserAccessType.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index 348213ee1..2f5dcdf3d 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -41,6 +41,12 @@ namespace Emby.Server.Implementations.SyncPlay
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
+        /// <summary>
+        /// The map between users and counter of active sessions.
+        /// </summary>
+        private readonly ConcurrentDictionary<Guid, int> _activeUsers =
+            new ConcurrentDictionary<Guid, int>();
+
         /// <summary>
         /// The map between sessions and groups.
         /// </summary>
@@ -122,6 +128,7 @@ namespace Emby.Server.Implementations.SyncPlay
                     throw new InvalidOperationException("Could not add session to group!");
                 }
 
+                UpdateSessionsCounter(session.UserId, 1);
                 group.CreateGroup(session, request, cancellationToken);
             }
         }
@@ -172,6 +179,7 @@ namespace Emby.Server.Implementations.SyncPlay
                         if (existingGroup.GroupId.Equals(request.GroupId))
                         {
                             // Restore session.
+                            UpdateSessionsCounter(session.UserId, 1);
                             group.SessionJoin(session, request, cancellationToken);
                             return;
                         }
@@ -185,6 +193,7 @@ namespace Emby.Server.Implementations.SyncPlay
                         throw new InvalidOperationException("Could not add session to group!");
                     }
 
+                    UpdateSessionsCounter(session.UserId, 1);
                     group.SessionJoin(session, request, cancellationToken);
                 }
             }
@@ -223,6 +232,7 @@ namespace Emby.Server.Implementations.SyncPlay
                             throw new InvalidOperationException("Could not remove session from group!");
                         }
 
+                        UpdateSessionsCounter(session.UserId, -1);
                         group.SessionLeave(session, request, cancellationToken);
 
                         if (group.IsGroupEmpty())
@@ -318,6 +328,19 @@ namespace Emby.Server.Implementations.SyncPlay
             }
         }
 
+        /// <inheritdoc />
+        public bool IsUserActive(Guid userId)
+        {
+            if (_activeUsers.TryGetValue(userId, out var sessionsCounter))
+            {
+                return sessionsCounter > 0;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         /// <summary>
         /// Releases unmanaged and optionally managed resources.
         /// </summary>
@@ -343,5 +366,26 @@ namespace Emby.Server.Implementations.SyncPlay
                 JoinGroup(session, request, CancellationToken.None);
             }
         }
+
+        private void UpdateSessionsCounter(Guid userId, int toAdd)
+        {
+            // Update sessions counter.
+            var newSessionsCounter = _activeUsers.AddOrUpdate(
+                userId,
+                1,
+                (key, sessionsCounter) => sessionsCounter + toAdd);
+
+            // Should never happen.
+            if (newSessionsCounter < 0)
+            {
+                throw new InvalidOperationException("Sessions counter is negative!");
+            }
+
+            // Clean record if user has no more active sessions.
+            if (newSessionsCounter == 0)
+            {
+                _activeUsers.TryRemove(new KeyValuePair<Guid, int>(userId, newSessionsCounter));
+            }
+        }
     }
 }
diff --git a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
index b5932ea6b..fd8286b1d 100644
--- a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
+++ b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessHandler.cs
@@ -3,6 +3,7 @@ using Jellyfin.Api.Helpers;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.SyncPlay;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 
@@ -13,20 +14,24 @@ namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
     /// </summary>
     public class SyncPlayAccessHandler : BaseAuthorizationHandler<SyncPlayAccessRequirement>
     {
+        private readonly ISyncPlayManager _syncPlayManager;
         private readonly IUserManager _userManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SyncPlayAccessHandler"/> class.
         /// </summary>
+        /// <param name="syncPlayManager">Instance of the <see cref="ISyncPlayManager"/> interface.</param>
         /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
         /// <param name="networkManager">Instance of the <see cref="INetworkManager"/> interface.</param>
         /// <param name="httpContextAccessor">Instance of the <see cref="IHttpContextAccessor"/> interface.</param>
         public SyncPlayAccessHandler(
+            ISyncPlayManager syncPlayManager,
             IUserManager userManager,
             INetworkManager networkManager,
             IHttpContextAccessor httpContextAccessor)
             : base(userManager, networkManager, httpContextAccessor)
         {
+            _syncPlayManager = syncPlayManager;
             _userManager = userManager;
         }
 
@@ -42,10 +47,52 @@ namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
             var userId = ClaimHelpers.GetUserId(context.User);
             var user = _userManager.GetUserById(userId!.Value);
 
-            if ((requirement.RequiredAccess.HasValue && user.SyncPlayAccess == requirement.RequiredAccess)
-                || user.SyncPlayAccess == SyncPlayAccess.CreateAndJoinGroups)
+            if (requirement.RequiredAccess == SyncPlayAccessRequirementType.HasAccess)
             {
-                context.Succeed(requirement);
+                if (user.SyncPlayAccess == SyncPlayUserAccessType.CreateAndJoinGroups ||
+                    user.SyncPlayAccess == SyncPlayUserAccessType.JoinGroups ||
+                    _syncPlayManager.IsUserActive(userId!.Value))
+                {
+                    context.Succeed(requirement);
+                }
+                else
+                {
+                    context.Fail();
+                }
+            }
+            else if (requirement.RequiredAccess == SyncPlayAccessRequirementType.CreateGroup)
+            {
+                if (user.SyncPlayAccess == SyncPlayUserAccessType.CreateAndJoinGroups)
+                {
+                    context.Succeed(requirement);
+                }
+                else
+                {
+                    context.Fail();
+                }
+            }
+            else if (requirement.RequiredAccess == SyncPlayAccessRequirementType.JoinGroup)
+            {
+                if (user.SyncPlayAccess == SyncPlayUserAccessType.CreateAndJoinGroups ||
+                    user.SyncPlayAccess == SyncPlayUserAccessType.JoinGroups)
+                {
+                    context.Succeed(requirement);
+                }
+                else
+                {
+                    context.Fail();
+                }
+            }
+            else if (requirement.RequiredAccess == SyncPlayAccessRequirementType.IsInGroup)
+            {
+                if (_syncPlayManager.IsUserActive(userId!.Value))
+                {
+                    context.Succeed(requirement);
+                }
+                else
+                {
+                    context.Fail();
+                }
             }
             else
             {
diff --git a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs
index 7fcaf69f6..6fab4c0ad 100644
--- a/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs
+++ b/Jellyfin.Api/Auth/SyncPlayAccessPolicy/SyncPlayAccessRequirement.cs
@@ -11,23 +11,15 @@ namespace Jellyfin.Api.Auth.SyncPlayAccessPolicy
         /// <summary>
         /// Initializes a new instance of the <see cref="SyncPlayAccessRequirement"/> class.
         /// </summary>
-        /// <param name="requiredAccess">A value of <see cref="SyncPlayAccess"/>.</param>
-        public SyncPlayAccessRequirement(SyncPlayAccess requiredAccess)
+        /// <param name="requiredAccess">A value of <see cref="SyncPlayAccessRequirementType"/>.</param>
+        public SyncPlayAccessRequirement(SyncPlayAccessRequirementType requiredAccess)
         {
             RequiredAccess = requiredAccess;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SyncPlayAccessRequirement"/> class.
-        /// </summary>
-        public SyncPlayAccessRequirement()
-        {
-            RequiredAccess = null;
-        }
-
         /// <summary>
         /// Gets the required SyncPlay access.
         /// </summary>
-        public SyncPlayAccess? RequiredAccess { get; }
+        public SyncPlayAccessRequirementType RequiredAccess { get; }
     }
 }
diff --git a/Jellyfin.Api/Constants/Policies.cs b/Jellyfin.Api/Constants/Policies.cs
index b35ceea1a..632dedb3c 100644
--- a/Jellyfin.Api/Constants/Policies.cs
+++ b/Jellyfin.Api/Constants/Policies.cs
@@ -51,13 +51,23 @@ namespace Jellyfin.Api.Constants
         public const string FirstTimeSetupOrIgnoreParentalControl = "FirstTimeSetupOrIgnoreParentalControl";
 
         /// <summary>
-        /// Policy name for requiring access to SyncPlay.
+        /// Policy name for accessing SyncPlay.
         /// </summary>
-        public const string SyncPlayAccess = "SyncPlayAccess";
+        public const string SyncPlayHasAccess = "SyncPlayHasAccess";
 
         /// <summary>
-        /// Policy name for requiring group creation access to SyncPlay.
+        /// Policy name for creating a SyncPlay group.
         /// </summary>
-        public const string SyncPlayCreateGroupAccess = "SyncPlayCreateGroupAccess";
+        public const string SyncPlayCreateGroup = "SyncPlayCreateGroup";
+
+        /// <summary>
+        /// Policy name for joining a SyncPlay group.
+        /// </summary>
+        public const string SyncPlayJoinGroup = "SyncPlayJoinGroup";
+
+        /// <summary>
+        /// Policy name for accessing a SyncPlay group.
+        /// </summary>
+        public const string SyncPlayIsInGroup = "SyncPlayIsInGroup";
     }
 }
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 471c9180d..82cbe58df 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -20,7 +20,7 @@ namespace Jellyfin.Api.Controllers
     /// <summary>
     /// The sync play controller.
     /// </summary>
-    [Authorize(Policy = Policies.SyncPlayAccess)]
+    [Authorize(Policy = Policies.SyncPlayHasAccess)]
     public class SyncPlayController : BaseJellyfinApiController
     {
         private readonly ISessionManager _sessionManager;
@@ -51,7 +51,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("New")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [Authorize(Policy = Policies.SyncPlayCreateGroupAccess)]
+        [Authorize(Policy = Policies.SyncPlayCreateGroup)]
         public ActionResult SyncPlayCreateGroup(
             [FromBody, Required] NewGroupRequestDto requestData)
         {
@@ -69,7 +69,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Join")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [Authorize(Policy = Policies.SyncPlayAccess)]
+        [Authorize(Policy = Policies.SyncPlayJoinGroup)]
         public ActionResult SyncPlayJoinGroup(
             [FromBody, Required] JoinGroupRequestDto requestData)
         {
@@ -86,6 +86,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Leave")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayLeaveGroup()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -101,7 +102,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>An <see cref="IEnumerable{GroupInfoView}"/> containing the available SyncPlay groups.</returns>
         [HttpGet("List")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        [Authorize(Policy = Policies.SyncPlayAccess)]
+        [Authorize(Policy = Policies.SyncPlayJoinGroup)]
         public ActionResult<IEnumerable<GroupInfoDto>> SyncPlayGetGroups()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -117,6 +118,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetNewQueue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySetNewQueue(
             [FromBody, Required] PlayRequestDto requestData)
         {
@@ -137,6 +139,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetPlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySetPlaylistItem(
             [FromBody, Required] SetPlaylistItemRequestDto requestData)
         {
@@ -154,6 +157,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("RemoveFromPlaylist")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayRemoveFromPlaylist(
             [FromBody, Required] RemoveFromPlaylistRequestDto requestData)
         {
@@ -171,6 +175,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("MovePlaylistItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayMovePlaylistItem(
             [FromBody, Required] MovePlaylistItemRequestDto requestData)
         {
@@ -188,6 +193,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Queue")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayQueue(
             [FromBody, Required] QueueRequestDto requestData)
         {
@@ -204,6 +210,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Unpause")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayUnpause()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -219,6 +226,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Pause")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayPause()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -234,6 +242,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Stop")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayStop()
         {
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authorizationContext, Request);
@@ -250,6 +259,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Seek")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySeek(
             [FromBody, Required] SeekRequestDto requestData)
         {
@@ -267,6 +277,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Buffering")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayBuffering(
             [FromBody, Required] BufferRequestDto requestData)
         {
@@ -288,6 +299,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("Ready")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayReady(
             [FromBody, Required] ReadyRequestDto requestData)
         {
@@ -309,6 +321,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetIgnoreWait")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySetIgnoreWait(
             [FromBody, Required] IgnoreWaitRequestDto requestData)
         {
@@ -326,6 +339,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("NextItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayNextItem(
             [FromBody, Required] NextItemRequestDto requestData)
         {
@@ -343,6 +357,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("PreviousItem")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlayPreviousItem(
             [FromBody, Required] PreviousItemRequestDto requestData)
         {
@@ -360,6 +375,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetRepeatMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySetRepeatMode(
             [FromBody, Required] SetRepeatModeRequestDto requestData)
         {
@@ -377,6 +393,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
         [HttpPost("SetShuffleMode")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [Authorize(Policy = Policies.SyncPlayIsInGroup)]
         public ActionResult SyncPlaySetShuffleMode(
             [FromBody, Required] SetShuffleModeRequestDto requestData)
         {
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 6d4681914..0fd8cb224 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -71,7 +71,7 @@ namespace Jellyfin.Data.Entities
             EnableAutoLogin = false;
             PlayDefaultAudioTrack = true;
             SubtitleMode = SubtitlePlaybackMode.Default;
-            SyncPlayAccess = SyncPlayAccess.CreateAndJoinGroups;
+            SyncPlayAccess = SyncPlayUserAccessType.CreateAndJoinGroups;
 
             AddDefaultPermissions();
             AddDefaultPreferences();
@@ -326,7 +326,7 @@ namespace Jellyfin.Data.Entities
         /// <summary>
         /// Gets or sets the level of sync play permissions this user has.
         /// </summary>
-        public SyncPlayAccess SyncPlayAccess { get; set; }
+        public SyncPlayUserAccessType SyncPlayAccess { get; set; }
 
         /// <summary>
         /// Gets or sets the row version.
diff --git a/Jellyfin.Data/Enums/SyncPlayAccess.cs b/Jellyfin.Data/Enums/SyncPlayAccess.cs
deleted file mode 100644
index 8c13b37a1..000000000
--- a/Jellyfin.Data/Enums/SyncPlayAccess.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Jellyfin.Data.Enums
-{
-    /// <summary>
-    /// Enum SyncPlayAccess.
-    /// </summary>
-    public enum SyncPlayAccess
-    {
-        /// <summary>
-        /// User can create groups and join them.
-        /// </summary>
-        CreateAndJoinGroups = 0,
-
-        /// <summary>
-        /// User can only join already existing groups.
-        /// </summary>
-        JoinGroups = 1,
-
-        /// <summary>
-        /// SyncPlay is disabled for the user.
-        /// </summary>
-        None = 2
-    }
-}
diff --git a/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
new file mode 100644
index 000000000..8c3e6cb17
--- /dev/null
+++ b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
@@ -0,0 +1,28 @@
+namespace Jellyfin.Data.Enums
+{
+    /// <summary>
+    /// Enum SyncPlayAccessRequirementType.
+    /// </summary>
+    public enum SyncPlayAccessRequirementType
+    {
+        /// <summary>
+        /// User must have access to SyncPlay, in some form.
+        /// </summary>
+        HasAccess = 0,
+
+        /// <summary>
+        /// User must be able to create groups.
+        /// </summary>
+        CreateGroup = 1,
+
+        /// <summary>
+        /// User must be able to join groups.
+        /// </summary>
+        JoinGroup = 2,
+
+        /// <summary>
+        /// User must be in a group.
+        /// </summary>
+        IsInGroup = 3
+    }
+}
diff --git a/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
new file mode 100644
index 000000000..030d16fb9
--- /dev/null
+++ b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
@@ -0,0 +1,23 @@
+namespace Jellyfin.Data.Enums
+{
+    /// <summary>
+    /// Enum SyncPlayUserAccessType.
+    /// </summary>
+    public enum SyncPlayUserAccessType
+    {
+        /// <summary>
+        /// User can create groups and join them.
+        /// </summary>
+        CreateAndJoinGroups = 0,
+
+        /// <summary>
+        /// User can only join already existing groups.
+        /// </summary>
+        JoinGroups = 1,
+
+        /// <summary>
+        /// SyncPlay is disabled for the user.
+        /// </summary>
+        None = 2
+    }
+}
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index b256c869c..f38beb7f9 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -127,18 +127,32 @@ namespace Jellyfin.Server.Extensions
                         policy.AddRequirements(new RequiresElevationRequirement());
                     });
                 options.AddPolicy(
-                    Policies.SyncPlayAccess,
+                    Policies.SyncPlayHasAccess,
                     policy =>
                     {
                         policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
-                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccess.JoinGroups));
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccessRequirementType.HasAccess));
                     });
                 options.AddPolicy(
-                    Policies.SyncPlayCreateGroupAccess,
+                    Policies.SyncPlayCreateGroup,
                     policy =>
                     {
                         policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
-                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccess.CreateAndJoinGroups));
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccessRequirementType.CreateGroup));
+                    });
+                options.AddPolicy(
+                    Policies.SyncPlayJoinGroup,
+                    policy =>
+                    {
+                        policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccessRequirementType.JoinGroup));
+                    });
+                options.AddPolicy(
+                    Policies.SyncPlayIsInGroup,
+                    policy =>
+                    {
+                        policy.AddAuthenticationSchemes(AuthenticationSchemes.CustomAuthentication);
+                        policy.AddRequirements(new SyncPlayAccessRequirement(SyncPlayAccessRequirementType.IsInGroup));
                     });
             });
         }
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index d0244563a..1c954828c 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -51,5 +51,12 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         void HandleRequest(SessionInfo session, IGroupPlaybackRequest request, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Checks whether a user has an active session using SyncPlay.
+        /// </summary>
+        /// <param name="userId">The user identifier to check.</param>
+        /// <returns><c>true</c> if the user is using SyncPlay; <c>false</c> otherwise.</returns>
+        bool IsUserActive(Guid userId);
     }
 }
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 363b2633f..37da04adf 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -111,7 +111,7 @@ namespace MediaBrowser.Model.Users
         /// Gets or sets a value indicating what SyncPlay features the user can access.
         /// </summary>
         /// <value>Access level to SyncPlay features.</value>
-        public SyncPlayAccess SyncPlayAccess { get; set; }
+        public SyncPlayUserAccessType SyncPlayAccess { get; set; }
 
         public UserPolicy()
         {
@@ -160,7 +160,7 @@ namespace MediaBrowser.Model.Users
             EnableContentDownloading = true;
             EnablePublicSharing = true;
             EnableRemoteAccess = true;
-            SyncPlayAccess = SyncPlayAccess.CreateAndJoinGroups;
+            SyncPlayAccess = SyncPlayUserAccessType.CreateAndJoinGroups;
         }
     }
 }
-- 
cgit v1.2.3


From 223b42aed3395f7d01ea513bf352cdf4fd3e7002 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 10 Feb 2021 17:09:23 -0700
Subject: Create BaseItemKind enum

---
 Emby.Server.Implementations/Dto/DtoService.cs     |   4 +-
 Jellyfin.Api/Controllers/ArtistsController.cs     |  18 +-
 Jellyfin.Api/Controllers/CollectionController.cs  |   1 -
 Jellyfin.Api/Controllers/DashboardController.cs   |   6 -
 Jellyfin.Api/Controllers/DynamicHlsController.cs  |   1 -
 Jellyfin.Api/Controllers/FilterController.cs      |  37 ++---
 Jellyfin.Api/Controllers/GenresController.cs      |   9 +-
 Jellyfin.Api/Controllers/HlsSegmentController.cs  |   2 -
 Jellyfin.Api/Controllers/InstantMixController.cs  |   1 -
 Jellyfin.Api/Controllers/ItemLookupController.cs  |   2 -
 Jellyfin.Api/Controllers/ItemsController.cs       |  27 ++-
 Jellyfin.Api/Controllers/LibraryController.cs     |   1 -
 Jellyfin.Api/Controllers/MusicGenresController.cs |   9 +-
 Jellyfin.Api/Controllers/PackageController.cs     |   1 -
 Jellyfin.Api/Controllers/PersonsController.cs     |   1 -
 Jellyfin.Api/Controllers/PlaylistsController.cs   |   1 -
 Jellyfin.Api/Controllers/PluginsController.cs     |   2 -
 Jellyfin.Api/Controllers/SearchController.cs      |   9 +-
 Jellyfin.Api/Controllers/StudiosController.cs     |   9 +-
 Jellyfin.Api/Controllers/SuggestionsController.cs |   1 -
 Jellyfin.Api/Controllers/SyncPlayController.cs    |   1 -
 Jellyfin.Api/Controllers/SystemController.cs      |   1 -
 Jellyfin.Api/Controllers/TimeSyncController.cs    |   1 -
 Jellyfin.Api/Controllers/TrailersController.cs    |   4 +-
 Jellyfin.Api/Controllers/TvShowsController.cs     |   1 -
 Jellyfin.Api/Controllers/UserLibraryController.cs |   5 +-
 Jellyfin.Api/Controllers/UserViewsController.cs   |   1 -
 Jellyfin.Api/Controllers/VideoHlsController.cs    |   1 -
 Jellyfin.Api/Controllers/YearsController.cs       |  15 +-
 Jellyfin.Api/Helpers/RequestHelpers.cs            |  16 ++
 Jellyfin.Data/Enums/BaseItemKind.cs               | 190 ++++++++++++++++++++++
 MediaBrowser.Controller/Entities/BaseItem.cs      |   5 +
 MediaBrowser.Model/Dto/BaseItemDto.cs             |   3 +-
 33 files changed, 289 insertions(+), 97 deletions(-)
 create mode 100644 Jellyfin.Data/Enums/BaseItemKind.cs

(limited to 'Jellyfin.Api/Controllers/SyncPlayController.cs')

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index e3ab0d6ea..54b18a8c8 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -249,7 +249,7 @@ namespace Emby.Server.Implementations.Dto
             var activeRecording = liveTvManager.GetActiveRecordingInfo(item.Path);
             if (activeRecording != null)
             {
-                dto.Type = "Recording";
+                dto.Type = BaseItemKind.Recording;
                 dto.CanDownload = false;
                 dto.RunTimeTicks = null;
 
@@ -904,7 +904,7 @@ namespace Emby.Server.Implementations.Dto
                 }
             }
 
-            dto.Type = item.GetClientTypeName();
+            dto.Type = item.GetBaseItemKind();
             if ((item.CommunityRating ?? 0) > 0)
             {
                 dto.CommunityRating = item.CommunityRating;
diff --git a/Jellyfin.Api/Controllers/ArtistsController.cs b/Jellyfin.Api/Controllers/ArtistsController.cs
index fed7ed3e5..4b2e5e7ea 100644
--- a/Jellyfin.Api/Controllers/ArtistsController.cs
+++ b/Jellyfin.Api/Controllers/ArtistsController.cs
@@ -3,8 +3,10 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
+using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -88,8 +90,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? searchTerm,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
@@ -127,8 +129,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 MediaTypes = mediaTypes,
                 StartIndex = startIndex,
                 Limit = limit,
@@ -287,8 +289,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? searchTerm,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
@@ -326,8 +328,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 MediaTypes = mediaTypes,
                 StartIndex = startIndex,
                 Limit = limit,
diff --git a/Jellyfin.Api/Controllers/CollectionController.cs b/Jellyfin.Api/Controllers/CollectionController.cs
index 2a7b2b5c6..852d1e9cb 100644
--- a/Jellyfin.Api/Controllers/CollectionController.cs
+++ b/Jellyfin.Api/Controllers/CollectionController.cs
@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
diff --git a/Jellyfin.Api/Controllers/DashboardController.cs b/Jellyfin.Api/Controllers/DashboardController.cs
index ff7895373..b2baa9cea 100644
--- a/Jellyfin.Api/Controllers/DashboardController.cs
+++ b/Jellyfin.Api/Controllers/DashboardController.cs
@@ -7,17 +7,11 @@ using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Models;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Plugins;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 
 namespace Jellyfin.Api.Controllers
 {
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 6e85737d2..e375645cf 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -15,7 +15,6 @@ using Jellyfin.Api.Helpers;
 using Jellyfin.Api.Models.PlaybackDtos;
 using Jellyfin.Api.Models.StreamingDtos;
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
diff --git a/Jellyfin.Api/Controllers/FilterController.cs b/Jellyfin.Api/Controllers/FilterController.cs
index 9220b988f..223b2a2b6 100644
--- a/Jellyfin.Api/Controllers/FilterController.cs
+++ b/Jellyfin.Api/Controllers/FilterController.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Linq;
 using Jellyfin.Api.Constants;
+using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
@@ -51,7 +50,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult<QueryFiltersLegacy> GetQueryFiltersLegacy(
             [FromQuery] Guid? userId,
             [FromQuery] Guid? parentId,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes)
         {
             var user = userId.HasValue && !userId.Equals(Guid.Empty)
@@ -60,10 +59,10 @@ namespace Jellyfin.Api.Controllers
 
             BaseItem? item = null;
             if (includeItemTypes.Length != 1
-                || !(string.Equals(includeItemTypes[0], nameof(BoxSet), StringComparison.OrdinalIgnoreCase)
-                     || string.Equals(includeItemTypes[0], nameof(Playlist), StringComparison.OrdinalIgnoreCase)
-                     || string.Equals(includeItemTypes[0], nameof(Trailer), StringComparison.OrdinalIgnoreCase)
-                     || string.Equals(includeItemTypes[0], "Program", StringComparison.OrdinalIgnoreCase)))
+                || !(includeItemTypes[0] == BaseItemKind.BoxSet
+                     || includeItemTypes[0] == BaseItemKind.Playlist
+                     || includeItemTypes[0] == BaseItemKind.Trailer
+                     || includeItemTypes[0] == BaseItemKind.Program))
             {
                 item = _libraryManager.GetParentItem(parentId, user?.Id);
             }
@@ -72,7 +71,7 @@ namespace Jellyfin.Api.Controllers
             {
                 User = user,
                 MediaTypes = mediaTypes,
-                IncludeItemTypes = includeItemTypes,
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 Recursive = true,
                 EnableTotalRecordCount = false,
                 DtoOptions = new DtoOptions
@@ -137,7 +136,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult<QueryFilters> GetQueryFilters(
             [FromQuery] Guid? userId,
             [FromQuery] Guid? parentId,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool? isAiring,
             [FromQuery] bool? isMovie,
             [FromQuery] bool? isSports,
@@ -152,10 +151,10 @@ namespace Jellyfin.Api.Controllers
 
             BaseItem? parentItem = null;
             if (includeItemTypes.Length == 1
-                && (string.Equals(includeItemTypes[0], nameof(BoxSet), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], nameof(Playlist), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], nameof(Trailer), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], "Program", StringComparison.OrdinalIgnoreCase)))
+                && (includeItemTypes[0] == BaseItemKind.BoxSet
+                    || includeItemTypes[0] == BaseItemKind.Playlist
+                    || includeItemTypes[0] == BaseItemKind.Trailer
+                    || includeItemTypes[0] == BaseItemKind.Program))
             {
                 parentItem = null;
             }
@@ -167,7 +166,7 @@ namespace Jellyfin.Api.Controllers
             var filters = new QueryFilters();
             var genreQuery = new InternalItemsQuery(user)
             {
-                IncludeItemTypes = includeItemTypes,
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 DtoOptions = new DtoOptions
                 {
                     Fields = Array.Empty<ItemFields>(),
@@ -192,10 +191,10 @@ namespace Jellyfin.Api.Controllers
             }
 
             if (includeItemTypes.Length == 1
-                && (string.Equals(includeItemTypes[0], nameof(MusicAlbum), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], nameof(MusicVideo), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], nameof(MusicArtist), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(includeItemTypes[0], nameof(Audio), StringComparison.OrdinalIgnoreCase)))
+                && (includeItemTypes[0] == BaseItemKind.MusicAlbum
+                    || includeItemTypes[0] == BaseItemKind.MusicVideo
+                    || includeItemTypes[0] == BaseItemKind.MusicArtist
+                    || includeItemTypes[0] == BaseItemKind.Audio))
             {
                 filters.Genres = _libraryManager.GetMusicGenres(genreQuery).Items.Select(i => new NameGuidPair
                 {
diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.cs
index b6755ed5e..7bcf4674c 100644
--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -6,6 +6,7 @@ using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -74,8 +75,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? searchTerm,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool? isFavorite,
             [FromQuery] int? imageTypeLimit,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
@@ -96,8 +97,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 StartIndex = startIndex,
                 Limit = limit,
                 IsFavorite = isFavorite,
diff --git a/Jellyfin.Api/Controllers/HlsSegmentController.cs b/Jellyfin.Api/Controllers/HlsSegmentController.cs
index f51987732..25abe73ed 100644
--- a/Jellyfin.Api/Controllers/HlsSegmentController.cs
+++ b/Jellyfin.Api/Controllers/HlsSegmentController.cs
@@ -2,13 +2,11 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.IO;
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index 244625752..f061755c3 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.ModelBinders;
diff --git a/Jellyfin.Api/Controllers/ItemLookupController.cs b/Jellyfin.Api/Controllers/ItemLookupController.cs
index 6c38f77ce..dfc68ffce 100644
--- a/Jellyfin.Api/Controllers/ItemLookupController.cs
+++ b/Jellyfin.Api/Controllers/ItemLookupController.cs
@@ -2,8 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
-using System.Linq;
-using System.Net.Mime;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 7d7747495..2c9760f6d 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
@@ -178,8 +177,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
@@ -233,8 +232,8 @@ namespace Jellyfin.Api.Controllers
                 .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
 
             if (includeItemTypes.Length == 1
-                && (includeItemTypes[0].Equals("Playlist", StringComparison.OrdinalIgnoreCase)
-                    || includeItemTypes[0].Equals("BoxSet", StringComparison.OrdinalIgnoreCase)))
+                && (includeItemTypes[0] == BaseItemKind.Playlist
+                    || includeItemTypes[0] == BaseItemKind.BoxSet))
             {
                 parentId = null;
             }
@@ -251,7 +250,7 @@ namespace Jellyfin.Api.Controllers
                 && string.Equals(hasCollectionType.CollectionType, CollectionType.Playlists, StringComparison.OrdinalIgnoreCase))
             {
                 recursive = true;
-                includeItemTypes = new[] { "Playlist" };
+                includeItemTypes = new[] { BaseItemKind.Playlist };
             }
 
             var enabledChannels = user!.GetPreferenceValues<Guid>(PreferenceKind.EnabledChannels);
@@ -286,8 +285,8 @@ namespace Jellyfin.Api.Controllers
                 {
                     IsPlayed = isPlayed,
                     MediaTypes = mediaTypes,
-                    IncludeItemTypes = includeItemTypes,
-                    ExcludeItemTypes = excludeItemTypes,
+                    IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
+                    ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
                     Recursive = recursive ?? false,
                     OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder),
                     IsFavorite = isFavorite,
@@ -611,8 +610,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
@@ -773,8 +772,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool? enableUserData,
             [FromQuery] int? imageTypeLimit,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool enableTotalRecordCount = true,
             [FromQuery] bool? enableImages = true)
         {
@@ -810,8 +809,8 @@ namespace Jellyfin.Api.Controllers
                 CollapseBoxSetItems = false,
                 EnableTotalRecordCount = enableTotalRecordCount,
                 AncestorIds = ancestorIds,
-                IncludeItemTypes = includeItemTypes,
-                ExcludeItemTypes = excludeItemTypes,
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
                 SearchTerm = searchTerm
             });
 
diff --git a/Jellyfin.Api/Controllers/LibraryController.cs b/Jellyfin.Api/Controllers/LibraryController.cs
index 28d359ac3..db4aa9668 100644
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Api.Models.LibraryDtos;
 using Jellyfin.Data.Entities;
diff --git a/Jellyfin.Api/Controllers/MusicGenresController.cs b/Jellyfin.Api/Controllers/MusicGenresController.cs
index 2608a9cd0..7f7058b5e 100644
--- a/Jellyfin.Api/Controllers/MusicGenresController.cs
+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs
@@ -6,6 +6,7 @@ using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -74,8 +75,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? searchTerm,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool? isFavorite,
             [FromQuery] int? imageTypeLimit,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
@@ -96,8 +97,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 StartIndex = startIndex,
                 Limit = limit,
                 IsFavorite = isFavorite,
diff --git a/Jellyfin.Api/Controllers/PackageController.cs b/Jellyfin.Api/Controllers/PackageController.cs
index c589f54ac..5dd49ef2f 100644
--- a/Jellyfin.Api/Controllers/PackageController.cs
+++ b/Jellyfin.Api/Controllers/PackageController.cs
@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
-using MediaBrowser.Common.Json;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Updates;
diff --git a/Jellyfin.Api/Controllers/PersonsController.cs b/Jellyfin.Api/Controllers/PersonsController.cs
index 17e631197..70a94e27c 100644
--- a/Jellyfin.Api/Controllers/PersonsController.cs
+++ b/Jellyfin.Api/Controllers/PersonsController.cs
@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Dto;
diff --git a/Jellyfin.Api/Controllers/PlaylistsController.cs b/Jellyfin.Api/Controllers/PlaylistsController.cs
index a55e4ad2f..1667d6ede 100644
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Api.Models.PlaylistDtos;
 using MediaBrowser.Controller.Dto;
diff --git a/Jellyfin.Api/Controllers/PluginsController.cs b/Jellyfin.Api/Controllers/PluginsController.cs
index b73611c97..b2e8bee91 100644
--- a/Jellyfin.Api/Controllers/PluginsController.cs
+++ b/Jellyfin.Api/Controllers/PluginsController.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Mime;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
diff --git a/Jellyfin.Api/Controllers/SearchController.cs b/Jellyfin.Api/Controllers/SearchController.cs
index 08255ff8f..6c22050a7 100644
--- a/Jellyfin.Api/Controllers/SearchController.cs
+++ b/Jellyfin.Api/Controllers/SearchController.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -83,8 +84,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] int? limit,
             [FromQuery] Guid? userId,
             [FromQuery, Required] string searchTerm,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
             [FromQuery] Guid? parentId,
             [FromQuery] bool? isMovie,
@@ -109,8 +110,8 @@ namespace Jellyfin.Api.Controllers
                 IncludeStudios = includeStudios,
                 StartIndex = startIndex,
                 UserId = userId ?? Guid.Empty,
-                IncludeItemTypes = includeItemTypes,
-                ExcludeItemTypes = excludeItemTypes,
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
                 MediaTypes = mediaTypes,
                 ParentId = parentId,
 
diff --git a/Jellyfin.Api/Controllers/StudiosController.cs b/Jellyfin.Api/Controllers/StudiosController.cs
index bb54c59f6..da8f8b199 100644
--- a/Jellyfin.Api/Controllers/StudiosController.cs
+++ b/Jellyfin.Api/Controllers/StudiosController.cs
@@ -5,6 +5,7 @@ using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -73,8 +74,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? searchTerm,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool? isFavorite,
             [FromQuery] bool? enableUserData,
             [FromQuery] int? imageTypeLimit,
@@ -96,8 +97,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 StartIndex = startIndex,
                 Limit = limit,
                 IsFavorite = isFavorite,
diff --git a/Jellyfin.Api/Controllers/SuggestionsController.cs b/Jellyfin.Api/Controllers/SuggestionsController.cs
index 9f1dec712..a55f13e66 100644
--- a/Jellyfin.Api/Controllers/SuggestionsController.cs
+++ b/Jellyfin.Api/Controllers/SuggestionsController.cs
@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
diff --git a/Jellyfin.Api/Controllers/SyncPlayController.cs b/Jellyfin.Api/Controllers/SyncPlayController.cs
index 82cbe58df..f878f2329 100644
--- a/Jellyfin.Api/Controllers/SyncPlayController.cs
+++ b/Jellyfin.Api/Controllers/SyncPlayController.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading;
diff --git a/Jellyfin.Api/Controllers/SystemController.cs b/Jellyfin.Api/Controllers/SystemController.cs
index e67a27ae3..bbbe5fb8d 100644
--- a/Jellyfin.Api/Controllers/SystemController.cs
+++ b/Jellyfin.Api/Controllers/SystemController.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Mime;
-using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
diff --git a/Jellyfin.Api/Controllers/TimeSyncController.cs b/Jellyfin.Api/Controllers/TimeSyncController.cs
index c730ac12b..7df51c7af 100644
--- a/Jellyfin.Api/Controllers/TimeSyncController.cs
+++ b/Jellyfin.Api/Controllers/TimeSyncController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using MediaBrowser.Model.SyncPlay;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
diff --git a/Jellyfin.Api/Controllers/TrailersController.cs b/Jellyfin.Api/Controllers/TrailersController.cs
index 242b8f068..dd3836551 100644
--- a/Jellyfin.Api/Controllers/TrailersController.cs
+++ b/Jellyfin.Api/Controllers/TrailersController.cs
@@ -148,7 +148,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
@@ -194,7 +194,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool enableTotalRecordCount = true,
             [FromQuery] bool? enableImages = true)
         {
-            var includeItemTypes = new[] { "Trailer" };
+            var includeItemTypes = new[] { BaseItemKind.Trailer };
 
             return _itemsController
                 .GetItems(
diff --git a/Jellyfin.Api/Controllers/TvShowsController.cs b/Jellyfin.Api/Controllers/TvShowsController.cs
index 223f58859..e1c67f830 100644
--- a/Jellyfin.Api/Controllers/TvShowsController.cs
+++ b/Jellyfin.Api/Controllers/TvShowsController.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
diff --git a/Jellyfin.Api/Controllers/UserLibraryController.cs b/Jellyfin.Api/Controllers/UserLibraryController.cs
index 0e65591cc..1d70406ac 100644
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -8,6 +8,7 @@ using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -269,7 +270,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] Guid userId,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery] bool? isPlayed,
             [FromQuery] bool? enableImages,
             [FromQuery] int? imageTypeLimit,
@@ -296,7 +297,7 @@ namespace Jellyfin.Api.Controllers
                 new LatestItemsQuery
                 {
                     GroupItems = groupItems,
-                    IncludeItemTypes = includeItemTypes,
+                    IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                     IsPlayed = isPlayed,
                     Limit = limit,
                     ParentId = parentId ?? Guid.Empty,
diff --git a/Jellyfin.Api/Controllers/UserViewsController.cs b/Jellyfin.Api/Controllers/UserViewsController.cs
index e1483ce9d..7bc5ecdf1 100644
--- a/Jellyfin.Api/Controllers/UserViewsController.cs
+++ b/Jellyfin.Api/Controllers/UserViewsController.cs
@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Linq;
 using Jellyfin.Api.Extensions;
-using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Api.Models.UserViewDtos;
 using MediaBrowser.Controller.Dto;
diff --git a/Jellyfin.Api/Controllers/VideoHlsController.cs b/Jellyfin.Api/Controllers/VideoHlsController.cs
index 7e743ee0c..ba51aa43e 100644
--- a/Jellyfin.Api/Controllers/VideoHlsController.cs
+++ b/Jellyfin.Api/Controllers/VideoHlsController.cs
@@ -12,7 +12,6 @@ using Jellyfin.Api.Helpers;
 using Jellyfin.Api.Models.PlaybackDtos;
 using Jellyfin.Api.Models.StreamingDtos;
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index 7c27752f7..d6dc6650c 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -74,8 +74,8 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
             [FromQuery] Guid? parentId,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] mediaTypes,
             [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] sortBy,
             [FromQuery] bool? enableUserData,
@@ -101,8 +101,8 @@ namespace Jellyfin.Api.Controllers
 
             var query = new InternalItemsQuery(user)
             {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
+                ExcludeItemTypes = RequestHelpers.GetItemTypeStrings(excludeItemTypes),
+                IncludeItemTypes = RequestHelpers.GetItemTypeStrings(includeItemTypes),
                 MediaTypes = mediaTypes,
                 DtoOptions = dtoOptions
             };
@@ -193,16 +193,17 @@ namespace Jellyfin.Api.Controllers
             return _dtoService.GetBaseItemDto(item, dtoOptions);
         }
 
-        private bool FilterItem(BaseItem f, IReadOnlyCollection<string> excludeItemTypes, IReadOnlyCollection<string> includeItemTypes, IReadOnlyCollection<string> mediaTypes)
+        private bool FilterItem(BaseItem f, IReadOnlyCollection<BaseItemKind> excludeItemTypes, IReadOnlyCollection<BaseItemKind> includeItemTypes, IReadOnlyCollection<string> mediaTypes)
         {
+            var baseItemKind = f.GetBaseItemKind();
             // Exclude item types
-            if (excludeItemTypes.Count > 0 && excludeItemTypes.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase))
+            if (excludeItemTypes.Count > 0 && excludeItemTypes.Contains(baseItemKind))
             {
                 return false;
             }
 
             // Include item types
-            if (includeItemTypes.Count > 0 && !includeItemTypes.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase))
+            if (includeItemTypes.Count > 0 && !includeItemTypes.Contains(baseItemKind))
             {
                 return false;
             }
diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index db0ccc657..94856e03e 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -129,5 +129,21 @@ namespace Jellyfin.Api.Helpers
                 TotalRecordCount = result.TotalRecordCount
             };
         }
+
+        internal static string[] GetItemTypeStrings(IReadOnlyList<BaseItemKind> itemKinds)
+        {
+            if (itemKinds.Count == 0)
+            {
+                return Array.Empty<string>();
+            }
+
+            var itemTypes = new string[itemKinds.Count];
+            for (var i = 0; i < itemKinds.Count; i++)
+            {
+                itemTypes[i] = itemKinds[i].ToString();
+            }
+
+            return itemTypes;
+        }
     }
 }
diff --git a/Jellyfin.Data/Enums/BaseItemKind.cs b/Jellyfin.Data/Enums/BaseItemKind.cs
new file mode 100644
index 000000000..aac30279e
--- /dev/null
+++ b/Jellyfin.Data/Enums/BaseItemKind.cs
@@ -0,0 +1,190 @@
+namespace Jellyfin.Data.Enums
+{
+    /// <summary>
+    /// The base item kind.
+    /// </summary>
+    /// <remarks>
+    /// This enum is generated from all classes that inherit from <c>BaseItem</c>.
+    /// </remarks>
+    public enum BaseItemKind
+    {
+        /// <summary>
+        /// Item is aggregate folder.
+        /// </summary>
+        AggregateFolder,
+
+        /// <summary>
+        /// Item is audio.
+        /// </summary>
+        Audio,
+
+        /// <summary>
+        /// Item is audio book.
+        /// </summary>
+        AudioBook,
+
+        /// <summary>
+        /// Item is base plugin folder.
+        /// </summary>
+        BasePluginFolder,
+
+        /// <summary>
+        /// Item is book.
+        /// </summary>
+        Book,
+
+        /// <summary>
+        /// Item is box set.
+        /// </summary>
+        BoxSet,
+
+        /// <summary>
+        /// Item is channel.
+        /// </summary>
+        Channel,
+
+        /// <summary>
+        /// Item is channel folder item.
+        /// </summary>
+        ChannelFolderItem,
+
+        /// <summary>
+        /// Item is collection folder.
+        /// </summary>
+        CollectionFolder,
+
+        /// <summary>
+        /// Item is episode.
+        /// </summary>
+        Episode,
+
+        /// <summary>
+        /// Item is folder.
+        /// </summary>
+        Folder,
+
+        /// <summary>
+        /// Item is genre.
+        /// </summary>
+        Genre,
+
+        /// <summary>
+        /// Item is manual playlists folder.
+        /// </summary>
+        ManualPlaylistsFolder,
+
+        /// <summary>
+        /// Item is movie.
+        /// </summary>
+        Movie,
+
+        /// <summary>
+        /// Item is music album.
+        /// </summary>
+        MusicAlbum,
+
+        /// <summary>
+        /// Item is music artist.
+        /// </summary>
+        MusicArtist,
+
+        /// <summary>
+        /// Item is music genre.
+        /// </summary>
+        MusicGenre,
+
+        /// <summary>
+        /// Item is music video.
+        /// </summary>
+        MusicVideo,
+
+        /// <summary>
+        /// Item is person.
+        /// </summary>
+        Person,
+
+        /// <summary>
+        /// Item is photo.
+        /// </summary>
+        Photo,
+
+        /// <summary>
+        /// Item is photo album.
+        /// </summary>
+        PhotoAlbum,
+
+        /// <summary>
+        /// Item is playlist.
+        /// </summary>
+        Playlist,
+
+        /// <summary>
+        /// Item is program
+        /// </summary>
+        Program,
+
+        /// <summary>
+        /// Item is recording.
+        /// </summary>
+        /// <remarks>
+        /// Manually added.
+        /// </remarks>
+        Recording,
+
+        /// <summary>
+        /// Item is season.
+        /// </summary>
+        Season,
+
+        /// <summary>
+        /// Item is series.
+        /// </summary>
+        Series,
+
+        /// <summary>
+        /// Item is studio.
+        /// </summary>
+        Studio,
+
+        /// <summary>
+        /// Item is trailer.
+        /// </summary>
+        Trailer,
+
+        /// <summary>
+        /// Item is live tv channel.
+        /// </summary>
+        /// <remarks>
+        /// Type is overridden.
+        /// </remarks>
+        TvChannel,
+
+        /// <summary>
+        /// Item is live tv program.
+        /// </summary>
+        /// <remarks>
+        /// Type is overridden.
+        /// </remarks>
+        TvProgram,
+
+        /// <summary>
+        /// Item is user root folder.
+        /// </summary>
+        UserRootFolder,
+
+        /// <summary>
+        /// Item is user view.
+        /// </summary>
+        UserView,
+
+        /// <summary>
+        /// Item is video.
+        /// </summary>
+        Video,
+
+        /// <summary>
+        /// Item is year.
+        /// </summary>
+        Year
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index cbb02aabd..7598b29e6 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1998,6 +1998,11 @@ namespace MediaBrowser.Controller.Entities
             return GetType().Name;
         }
 
+        public BaseItemKind GetBaseItemKind()
+        {
+            return Enum.Parse<BaseItemKind>(GetClientTypeName());
+        }
+
         /// <summary>
         /// Gets the linked child.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 3f7aac9cd..2f9f9d3cd 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
@@ -276,7 +277,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        public string Type { get; set; }
+        public BaseItemKind Type { get; set; }
 
         /// <summary>
         /// Gets or sets the people.
-- 
cgit v1.2.3