Check that client is playing the right item

Send date when playback command is emitted
Rename some classes

Emby.Server.Implementations/Session/SessionManager.cs

@@ -1156,7 +1156,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public async Task SendSyncplayCommand(string sessionId, SyncplayCommand command, CancellationToken cancellationToken)
+        public async Task SendSyncplayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken)
         {
             CheckDisposed();
             var session = GetSessionToRemoteControl(sessionId);
@@ -1164,7 +1164,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public async Task SendSyncplayGroupUpdate<T>(string sessionId, SyncplayGroupUpdate<T> command, CancellationToken cancellationToken)
+        public async Task SendSyncplayGroupUpdate<T>(string sessionId, GroupUpdate<T> command, CancellationToken cancellationToken)
         {
             CheckDisposed();
             var session = GetSessionToRemoteControl(sessionId);

Emby.Server.Implementations/Syncplay/SyncplayController.cs

@@ -129,7 +129,7 @@ namespace Emby.Server.Implementations.Syncplay
             }
         }
 
-        private Task SendGroupUpdate<T>(SessionInfo from, BroadcastType type, SyncplayGroupUpdate<T> message)
+        private Task SendGroupUpdate<T>(SessionInfo from, BroadcastType type, GroupUpdate<T> message)
         {
             IEnumerable<Task> GetTasks()
             {
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.Syncplay
             return Task.WhenAll(GetTasks());
         }
 
-        private Task SendCommand(SessionInfo from, BroadcastType type, SyncplayCommand message)
+        private Task SendCommand(SessionInfo from, BroadcastType type, SendCommand message)
         {
             IEnumerable<Task> GetTasks()
             {
@@ -157,18 +157,20 @@ namespace Emby.Server.Implementations.Syncplay
             return Task.WhenAll(GetTasks());
         }
 
-        private SyncplayCommand NewSyncplayCommand(SyncplayCommandType type) {
+        private SendCommand NewSyncplayCommand(SendCommandType type)
-            var command = new SyncplayCommand();
+        {
+            var command = new SendCommand();
             command.GroupId = _group.GroupId.ToString();
             command.Command = type;
             command.PositionTicks = _group.PositionTicks;
             command.When = _group.LastActivity.ToUniversalTime().ToString("o");
+            command.EmittedAt = DateTime.UtcNow.ToUniversalTime().ToString("o");
             return command;
         }
 
-        private SyncplayGroupUpdate<T> NewSyncplayGroupUpdate<T>(SyncplayGroupUpdateType type, T data)
+        private GroupUpdate<T> NewSyncplayGroupUpdate<T>(GroupUpdateType type, T data)
         {
-            var command = new SyncplayGroupUpdate<T>();
+            var command = new GroupUpdate<T>();
             command.GroupId = _group.GroupId.ToString();
             command.Type = type;
             command.Data = data;
@@ -186,35 +188,37 @@ namespace Emby.Server.Implementations.Syncplay
             _group.PositionTicks = session.PlayState.PositionTicks ??= 0;
             _group.LastActivity = DateTime.UtcNow;
 
-            var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
+            var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
             SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
-            var pauseCommand = NewSyncplayCommand(SyncplayCommandType.Pause);
+            var pauseCommand = NewSyncplayCommand(SendCommandType.Pause);
             SendCommand(session, BroadcastType.SingleSession, pauseCommand);
         }
 
         /// <inheritdoc />
-        public void SessionJoin(SessionInfo session)
+        public void SessionJoin(SessionInfo session, JoinGroupRequest request)
         {
-            if (session.NowPlayingItem != null && session.NowPlayingItem.Id.Equals(_group.PlayingItem.Id))
+            if (session.NowPlayingItem != null &&
+                session.NowPlayingItem.Id.Equals(_group.PlayingItem.Id) &&
+                request.PlayingItemId.Equals(_group.PlayingItem.Id))
             {
                 _group.AddSession(session);
                 _syncplayManager.MapSessionToGroup(session, this);
 
-                var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupJoined, _group.PositionTicks);
+                var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
                 SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
 
-                var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.UserJoined, session.UserName);
+                var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.UserJoined, session.UserName);
                 SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
 
                 // Client join and play, syncing will happen client side
                 if (!_group.IsPaused)
                 {
-                    var playCommand = NewSyncplayCommand(SyncplayCommandType.Play);
+                    var playCommand = NewSyncplayCommand(SendCommandType.Play);
                     SendCommand(session, BroadcastType.SingleSession, playCommand);
                 }
                 else
                 {
-                    var pauseCommand = NewSyncplayCommand(SyncplayCommandType.Pause);
+                    var pauseCommand = NewSyncplayCommand(SendCommandType.Pause);
                     SendCommand(session, BroadcastType.SingleSession, pauseCommand);
                 }
             }
@@ -223,7 +227,7 @@ namespace Emby.Server.Implementations.Syncplay
                 var playRequest = new PlayRequest();
                 playRequest.ItemIds = new Guid[] { _group.PlayingItem.Id };
                 playRequest.StartPositionTicks = _group.PositionTicks;
-                var update = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.PrepareSession, playRequest);
+                var update = NewSyncplayGroupUpdate(GroupUpdateType.PrepareSession, playRequest);
                 SendGroupUpdate(session, BroadcastType.SingleSession, update);
             }
         }
@@ -234,17 +238,17 @@ namespace Emby.Server.Implementations.Syncplay
             _group.RemoveSession(session);
             _syncplayManager.UnmapSessionFromGroup(session, this);
 
-            var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupLeft, _group.PositionTicks);
+            var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupLeft, _group.PositionTicks);
             SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
 
-            var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.UserLeft, session.UserName);
+            var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.UserLeft, session.UserName);
             SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
         }
 
         /// <inheritdoc />
-        public void HandleRequest(SessionInfo session, SyncplayRequestInfo request)
+        public void HandleRequest(SessionInfo session, PlaybackRequest request)
         {
-            if (request.Type.Equals(SyncplayRequestType.Play))
+            if (request.Type.Equals(PlaybackRequestType.Play))
             {
                 if (_group.IsPaused)
                 {
@@ -256,17 +260,17 @@ namespace Emby.Server.Implementations.Syncplay
                         delay
                     );
 
-                    var command = NewSyncplayCommand(SyncplayCommandType.Play);
+                    var command = NewSyncplayCommand(SendCommandType.Play);
                     SendCommand(session, BroadcastType.AllGroup, command);
                 }
                 else
                 {
                     // Client got lost
-                    var command = NewSyncplayCommand(SyncplayCommandType.Play);
+                    var command = NewSyncplayCommand(SendCommandType.Play);
                     SendCommand(session, BroadcastType.SingleSession, command);
                 }
             }
-            else if (request.Type.Equals(SyncplayRequestType.Pause))
+            else if (request.Type.Equals(PlaybackRequestType.Pause))
             {
                 if (!_group.IsPaused)
                 {
@@ -276,16 +280,16 @@ namespace Emby.Server.Implementations.Syncplay
                     _group.LastActivity = currentTime;
                     _group.PositionTicks += elapsedTime.Ticks > 0 ? elapsedTime.Ticks : 0;
 
-                    var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+                    var command = NewSyncplayCommand(SendCommandType.Pause);
                     SendCommand(session, BroadcastType.AllGroup, command);
                 }
                 else
                 {
-                    var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+                    var command = NewSyncplayCommand(SendCommandType.Pause);
                     SendCommand(session, BroadcastType.SingleSession, command);
                 }
             }
-            else if (request.Type.Equals(SyncplayRequestType.Seek))
+            else if (request.Type.Equals(PlaybackRequestType.Seek))
             {
                 // Sanitize PositionTicks
                 var ticks = request.PositionTicks ??= 0;
@@ -300,11 +304,11 @@ namespace Emby.Server.Implementations.Syncplay
                 _group.PositionTicks = ticks;
                 _group.LastActivity = DateTime.UtcNow;
 
-                var command = NewSyncplayCommand(SyncplayCommandType.Seek);
+                var command = NewSyncplayCommand(SendCommandType.Seek);
                 SendCommand(session, BroadcastType.AllGroup, command);
             }
             // TODO: client does not implement this yet
-            else if (request.Type.Equals(SyncplayRequestType.Buffering))
+            else if (request.Type.Equals(PlaybackRequestType.Buffering))
             {
                 if (!_group.IsPaused)
                 {
@@ -317,20 +321,20 @@ namespace Emby.Server.Implementations.Syncplay
                     _group.SetBuffering(session, true);
 
                     // Send pause command to all non-buffering sessions
-                    var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+                    var command = NewSyncplayCommand(SendCommandType.Pause);
                     SendCommand(session, BroadcastType.AllReady, command);
 
-                    var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupWait, session.UserName);
+                    var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.GroupWait, session.UserName);
                     SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
                 }
                 else
                 {
-                    var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+                    var command = NewSyncplayCommand(SendCommandType.Pause);
                     SendCommand(session, BroadcastType.SingleSession, command);
                 }
             }
             // TODO: client does not implement this yet
-            else if (request.Type.Equals(SyncplayRequestType.BufferingComplete))
+            else if (request.Type.Equals(PlaybackRequestType.BufferingComplete))
             {
                 if (_group.IsPaused)
                 {
@@ -344,7 +348,7 @@ namespace Emby.Server.Implementations.Syncplay
                         var clientPosition = TimeSpan.FromTicks(request.PositionTicks ??= 0) + elapsedTime;
                         var delay = _group.PositionTicks - clientPosition.Ticks;
 
-                        var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+                        var command = NewSyncplayCommand(SendCommandType.Pause);
                         command.When = currentTime.AddMilliseconds(
                             delay
                         ).ToUniversalTime().ToString("o");
@@ -367,7 +371,7 @@ namespace Emby.Server.Implementations.Syncplay
                             _group.LastActivity = currentTime.AddMilliseconds(
                                 delay
                             );
-                            var command = NewSyncplayCommand(SyncplayCommandType.Play);
+                            var command = NewSyncplayCommand(SendCommandType.Play);
                             SendCommand(session, BroadcastType.AllExceptSession, command);
                         }
                         else
@@ -380,7 +384,7 @@ namespace Emby.Server.Implementations.Syncplay
                                 delay
                             );
 
-                            var command = NewSyncplayCommand(SyncplayCommandType.Play);
+                            var command = NewSyncplayCommand(SendCommandType.Play);
                             SendCommand(session, BroadcastType.AllGroup, command);
                         }
                     }                    
@@ -388,17 +392,17 @@ namespace Emby.Server.Implementations.Syncplay
                 else
                 {
                     // Make sure client has latest group state
-                    var command = NewSyncplayCommand(SyncplayCommandType.Play);
+                    var command = NewSyncplayCommand(SendCommandType.Play);
                     SendCommand(session, BroadcastType.SingleSession, command);
                 }
             }
-            else if (request.Type.Equals(SyncplayRequestType.KeepAlive))
+            else if (request.Type.Equals(PlaybackRequestType.KeepAlive))
             {
                 _group.UpdatePing(session, request.Ping ??= _group.DefaulPing);
 
-                var keepAlive = new SyncplayGroupUpdate<string>();
+                var keepAlive = new GroupUpdate<string>();
                 keepAlive.GroupId = _group.GroupId.ToString();
-                keepAlive.Type = SyncplayGroupUpdateType.KeepAlive;
+                keepAlive.Type = GroupUpdateType.KeepAlive;
                 SendGroupUpdate(session, BroadcastType.SingleSession, keepAlive);
             }
         }

Emby.Server.Implementations/Syncplay/SyncplayManager.cs

@@ -166,7 +166,7 @@ namespace Emby.Server.Implementations.Syncplay
             if (user.Policy.SyncplayAccess != SyncplayAccess.CreateAndJoinGroups)
             {
                 // TODO: shall an error message be sent back to the client?
-                return;
+                throw new ArgumentException("User does not have permission to create groups");
             }
 
             if (IsSessionInGroup(session))
@@ -181,14 +181,14 @@ namespace Emby.Server.Implementations.Syncplay
         }
 
         /// <inheritdoc />
-        public void JoinGroup(SessionInfo session, string groupId)
+        public void JoinGroup(SessionInfo session, string groupId, JoinGroupRequest request)
         {
             var user = _userManager.GetUserById(session.UserId);
 
             if (user.Policy.SyncplayAccess == SyncplayAccess.None)
             {
                 // TODO: shall an error message be sent back to the client?
-                return;
+                throw new ArgumentException("User does not have access to syncplay");
             }
 
             if (IsSessionInGroup(session))
@@ -204,18 +204,18 @@ namespace Emby.Server.Implementations.Syncplay
             {
                 _logger.LogError("Syncplaymanager JoinGroup: " + groupId + " does not exist.");
 
-                var update = new SyncplayGroupUpdate<string>();
+                var update = new GroupUpdate<string>();
-                update.Type = SyncplayGroupUpdateType.NotInGroup;
+                update.Type = GroupUpdateType.NotInGroup;
                 _sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
                 return;
             }
 
             if (!HasAccessToItem(user, group.GetPlayingItemId()))
             {
-                return;
+                throw new ArgumentException("User does not have access to playing item");
             }
 
-            group.SessionJoin(session);
+            group.SessionJoin(session, request);
         }
 
         /// <inheritdoc />
@@ -230,8 +230,8 @@ namespace Emby.Server.Implementations.Syncplay
             {
                 _logger.LogWarning("Syncplaymanager HandleRequest: " + session.Id + " not in group.");
 
-                var update = new SyncplayGroupUpdate<string>();
+                var update = new GroupUpdate<string>();
-                update.Type = SyncplayGroupUpdateType.NotInGroup;
+                update.Type = GroupUpdateType.NotInGroup;
                 _sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
                 return;
             }
@@ -276,14 +276,14 @@ namespace Emby.Server.Implementations.Syncplay
         }
 
         /// <inheritdoc />
-        public void HandleRequest(SessionInfo session, SyncplayRequestInfo request)
+        public void HandleRequest(SessionInfo session, PlaybackRequest request)
         {
             var user = _userManager.GetUserById(session.UserId);
 
             if (user.Policy.SyncplayAccess == SyncplayAccess.None)
             {
                 // TODO: same as LeaveGroup
-                return;
+                throw new ArgumentException("User does not have access to syncplay");
             }
 
             ISyncplayController group;
@@ -293,8 +293,8 @@ namespace Emby.Server.Implementations.Syncplay
             {
                 _logger.LogWarning("Syncplaymanager HandleRequest: " + session.Id + " not in group.");
 
-                var update = new SyncplayGroupUpdate<string>();
+                var update = new GroupUpdate<string>();
-                update.Type = SyncplayGroupUpdateType.NotInGroup;
+                update.Type = GroupUpdateType.NotInGroup;
                 _sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
                 return;
             }

MediaBrowser.Api/Syncplay/SyncplayService.cs

@@ -31,6 +31,13 @@ namespace MediaBrowser.Api.Syncplay
         /// <value>The Group id to join.</value>
         [ApiMember(Name = "GroupId", Description = "Group Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
         public string GroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playing item id.
+        /// </summary>
+        /// <value>The client's currently playing item id.</value>
+        [ApiMember(Name = "PlayingItemId", Description = "Client's playing item id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string PlayingItemId { get; set; }
     }
 
     [Route("/Syncplay/{SessionId}/LeaveGroup", "POST", Summary = "Leave joined Syncplay group")]
@@ -160,7 +167,21 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplayJoinGroup request)
         {
             var currentSession = GetSession(_sessionContext);
-            _syncplayManager.JoinGroup(currentSession, request.GroupId);
+            var joinRequest = new JoinGroupRequest();
+            joinRequest.GroupId = Guid.Parse(request.GroupId);
+            try
+            {
+                joinRequest.PlayingItemId = Guid.Parse(request.PlayingItemId);
+            }
+            catch (ArgumentNullException)
+            {
+                // Do nothing
+            }
+            catch (FormatException)
+            {
+                // Do nothing
+            }
+            _syncplayManager.JoinGroup(currentSession, request.GroupId, joinRequest);
         }
 
         /// <summary>
@@ -191,8 +212,8 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplayPlayRequest request)
         {
             var currentSession = GetSession(_sessionContext);
-            var syncplayRequest = new SyncplayRequestInfo();
+            var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = SyncplayRequestType.Play;
+            syncplayRequest.Type = PlaybackRequestType.Play;
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
         }
 
@@ -203,8 +224,8 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplayPauseRequest request)
         {
             var currentSession = GetSession(_sessionContext);
-            var syncplayRequest = new SyncplayRequestInfo();
+            var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = SyncplayRequestType.Pause;
+            syncplayRequest.Type = PlaybackRequestType.Pause;
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
         }
 
@@ -215,8 +236,8 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplaySeekRequest request)
         {
             var currentSession = GetSession(_sessionContext);
-            var syncplayRequest = new SyncplayRequestInfo();
+            var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = SyncplayRequestType.Seek;
+            syncplayRequest.Type = PlaybackRequestType.Seek;
             syncplayRequest.PositionTicks = request.PositionTicks;
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
         }
@@ -228,8 +249,8 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplayBufferingRequest request)
         {
             var currentSession = GetSession(_sessionContext);
-            var syncplayRequest = new SyncplayRequestInfo();
+            var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = request.Resume ? SyncplayRequestType.BufferingComplete : SyncplayRequestType.Buffering;
+            syncplayRequest.Type = request.Resume ? PlaybackRequestType.BufferingComplete : PlaybackRequestType.Buffering;
             syncplayRequest.When = DateTime.Parse(request.When);
             syncplayRequest.PositionTicks = request.PositionTicks;
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
@@ -242,8 +263,8 @@ namespace MediaBrowser.Api.Syncplay
         public void Post(SyncplayKeepAlive request)
         {
             var currentSession = GetSession(_sessionContext);
-            var syncplayRequest = new SyncplayRequestInfo();
+            var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = SyncplayRequestType.KeepAlive;
+            syncplayRequest.Type = PlaybackRequestType.KeepAlive;
             syncplayRequest.Ping = Convert.ToInt64(request.Ping);
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
         }

MediaBrowser.Controller/Session/ISessionManager.cs

@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="command">The command.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendSyncplayCommand(string sessionId, SyncplayCommand command, CancellationToken cancellationToken);
+        Task SendSyncplayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken);
 
         /// <summary>
         /// Sends the SyncplayGroupUpdate.
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="command">The group update.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendSyncplayGroupUpdate<T>(string sessionId, SyncplayGroupUpdate<T> command, CancellationToken cancellationToken);
+        Task SendSyncplayGroupUpdate<T>(string sessionId, GroupUpdate<T> command, CancellationToken cancellationToken);
 
         /// <summary>
         /// Sends the browse command.

MediaBrowser.Controller/Syncplay/ISyncplayController.cs

@@ -37,7 +37,8 @@ namespace MediaBrowser.Controller.Syncplay
         /// Adds the session to the group.
         /// </summary>
         /// <param name="session">The session.</param>
-        void SessionJoin(SessionInfo session);
+        /// <param name="request">The request.</param>
+        void SessionJoin(SessionInfo session, JoinGroupRequest request);
 
         /// <summary>
         /// Removes the session from the group.
@@ -50,7 +51,7 @@ namespace MediaBrowser.Controller.Syncplay
         /// </summary>
         /// <param name="session">The session.</param>
         /// <param name="request">The requested action.</param>
-        void HandleRequest(SessionInfo session, SyncplayRequestInfo request);
+        void HandleRequest(SessionInfo session, PlaybackRequest request);
 
         /// <summary>
         /// Gets the info about the group for the clients.

MediaBrowser.Controller/Syncplay/ISyncplayManager.cs

@@ -21,7 +21,8 @@ namespace MediaBrowser.Controller.Syncplay
         /// </summary>
         /// <param name="session">The session.</param>
         /// <param name="groupId">The group id.</param>
-        void JoinGroup(SessionInfo session, string groupId);
+        /// <param name="request">The request.</param>
+        void JoinGroup(SessionInfo session, string groupId, JoinGroupRequest request);
 
         /// <summary>
         /// Removes the session from a group.
@@ -41,7 +42,7 @@ namespace MediaBrowser.Controller.Syncplay
         /// </summary>
         /// <param name="session">The session.</param>
         /// <param name="request">The request.</param>
-        void HandleRequest(SessionInfo session, SyncplayRequestInfo request);
+        void HandleRequest(SessionInfo session, PlaybackRequest request);
 
         /// <summary>
         /// Maps a session to a group.

MediaBrowser.Model/Syncplay/GroupUpdate.cs

@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Class SyncplayGroupUpdate.
+    /// Class GroupUpdate.
     /// </summary>
-    public class SyncplayGroupUpdate<T>
+    public class GroupUpdate<T>
     {
         /// <summary>
         /// Gets or sets the group identifier.
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Syncplay
         /// Gets or sets the update type.
         /// </summary>
         /// <value>The update type.</value>
-        public SyncplayGroupUpdateType Type { get; set; }
+        public GroupUpdateType Type { get; set; }
 
         /// <summary>
         /// Gets or sets the data.

MediaBrowser.Model/Syncplay/GroupUpdateType.cs

@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Enum SyncplayGroupUpdateType
+    /// Enum GroupUpdateType
     /// </summary>
-    public enum SyncplayGroupUpdateType
+    public enum GroupUpdateType
     {
         /// <summary>
         /// The user-joined update. Tells members of a group about a new user.

MediaBrowser.Model/Syncplay/JoinGroupRequest.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace MediaBrowser.Model.Syncplay
+{
+    /// <summary>
+    /// Class JoinGroupRequest.
+    /// </summary>
+    public class JoinGroupRequest
+    {
+        /// <summary>
+        /// Gets or sets the Group id.
+        /// </summary>
+        /// <value>The Group id to join.</value>
+        public Guid GroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playing item id.
+        /// </summary>
+        /// <value>The client's currently playing item id.</value>
+        public Guid PlayingItemId { get; set; }
+    }
+}

MediaBrowser.Model/Syncplay/PlaybackRequest.cs

@@ -3,15 +3,15 @@ using System;
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Class SyncplayRequestInfo.
+    /// Class PlaybackRequest.
     /// </summary>
-    public class SyncplayRequestInfo
+    public class PlaybackRequest
     {
         /// <summary>
         /// Gets or sets the request type.
         /// </summary>
         /// <value>The request type.</value>
-        public SyncplayRequestType Type;
+        public PlaybackRequestType Type;
 
         /// <summary>
         /// Gets or sets when the request has been made by the client.

MediaBrowser.Model/Syncplay/PlaybackRequestType.cs

@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Enum SyncplayRequestType
+    /// Enum PlaybackRequestType
     /// </summary>
-    public enum SyncplayRequestType
+    public enum PlaybackRequestType
     {
         /// <summary>
         /// A user is requesting a play command for the group.

MediaBrowser.Model/Syncplay/SendCommand.cs

@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Class SyncplayCommand.
+    /// Class SendCommand.
     /// </summary>
-    public class SyncplayCommand
+    public class SendCommand
     {
         /// <summary>
         /// Gets or sets the group identifier.
@@ -27,6 +27,12 @@ namespace MediaBrowser.Model.Syncplay
         /// Gets or sets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SyncplayCommandType Command { get; set; }
+        public SendCommandType Command { get; set; }
+
+        /// <summary>
+        /// 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; }
     }
 }

MediaBrowser.Model/Syncplay/SendCommandType.cs

@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Enum SyncplayCommandType.
+    /// Enum SendCommandType.
     /// </summary>
-    public enum SyncplayCommandType
+    public enum SendCommandType
     {
         /// <summary>
         /// The play command. Instructs users to start playback.