From 40889702d05c7a6f3dc30090e9443e94cb29fbd9 Mon Sep 17 00:00:00 2001
From: gion <oancaionutandrei@gmail.com>
Date: Fri, 17 Apr 2020 12:57:36 +0200
Subject: [PATCH] Update session ping

---
 .../Syncplay/SyncplayController.cs                        | 7 +------
 MediaBrowser.Api/Syncplay/SyncplayService.cs              | 8 ++++----
 MediaBrowser.Api/Syncplay/TimeSyncService.cs              | 2 --
 MediaBrowser.Model/Syncplay/GroupUpdateType.cs            | 4 ----
 MediaBrowser.Model/Syncplay/PlaybackRequestType.cs        | 2 +-
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Emby.Server.Implementations/Syncplay/SyncplayController.cs b/Emby.Server.Implementations/Syncplay/SyncplayController.cs
index fb37b2fb6f..83b4779447 100644
--- a/Emby.Server.Implementations/Syncplay/SyncplayController.cs
+++ b/Emby.Server.Implementations/Syncplay/SyncplayController.cs
@@ -396,14 +396,9 @@ namespace Emby.Server.Implementations.Syncplay
                     SendCommand(session, BroadcastType.SingleSession, command);
                 }
             }
-            else if (request.Type.Equals(PlaybackRequestType.KeepAlive))
+            else if (request.Type.Equals(PlaybackRequestType.UpdatePing))
             {
                 _group.UpdatePing(session, request.Ping ??= _group.DefaulPing);
-
-                var keepAlive = new GroupUpdate<string>();
-                keepAlive.GroupId = _group.GroupId.ToString();
-                keepAlive.Type = GroupUpdateType.KeepAlive;
-                SendGroupUpdate(session, BroadcastType.SingleSession, keepAlive);
             }
         }
 
diff --git a/MediaBrowser.Api/Syncplay/SyncplayService.cs b/MediaBrowser.Api/Syncplay/SyncplayService.cs
index c273e6c38c..af220ed81d 100644
--- a/MediaBrowser.Api/Syncplay/SyncplayService.cs
+++ b/MediaBrowser.Api/Syncplay/SyncplayService.cs
@@ -100,9 +100,9 @@ namespace MediaBrowser.Api.Syncplay
         public bool Resume { get; set; }
     }
 
-    [Route("/Syncplay/{SessionId}/KeepAlive", "POST", Summary = "Keep session alive")]
+    [Route("/Syncplay/{SessionId}/UpdatePing", "POST", Summary = "Update session ping")]
     [Authenticated]
-    public class SyncplayKeepAlive : IReturnVoid
+    public class SyncplayUpdatePing : IReturnVoid
     {
         [ApiMember(Name = "SessionId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
         public string SessionId { get; set; }
@@ -255,11 +255,11 @@ namespace MediaBrowser.Api.Syncplay
         /// Handles the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        public void Post(SyncplayKeepAlive request)
+        public void Post(SyncplayUpdatePing request)
         {
             var currentSession = GetSession(_sessionContext);
             var syncplayRequest = new PlaybackRequest();
-            syncplayRequest.Type = PlaybackRequestType.KeepAlive;
+            syncplayRequest.Type = PlaybackRequestType.UpdatePing;
             syncplayRequest.Ping = Convert.ToInt64(request.Ping);
             _syncplayManager.HandleRequest(currentSession, syncplayRequest);
         }
diff --git a/MediaBrowser.Api/Syncplay/TimeSyncService.cs b/MediaBrowser.Api/Syncplay/TimeSyncService.cs
index 049684d94c..a69e0e293a 100644
--- a/MediaBrowser.Api/Syncplay/TimeSyncService.cs
+++ b/MediaBrowser.Api/Syncplay/TimeSyncService.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Controller.Syncplay;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Syncplay;
 using Microsoft.Extensions.Logging;
diff --git a/MediaBrowser.Model/Syncplay/GroupUpdateType.cs b/MediaBrowser.Model/Syncplay/GroupUpdateType.cs
index ceb778b36f..0ef8b27853 100644
--- a/MediaBrowser.Model/Syncplay/GroupUpdateType.cs
+++ b/MediaBrowser.Model/Syncplay/GroupUpdateType.cs
@@ -30,10 +30,6 @@ namespace MediaBrowser.Model.Syncplay
         /// </summary>
         PrepareSession = 5,
         /// <summary>
-        /// The keep-alive update. An update to keep alive the socket.
-        /// </summary>
-        KeepAlive = 6,
-        /// <summary>
         /// The not-in-group update. Tells a user that no group has been joined.
         /// </summary>
         NotInGroup = 7
diff --git a/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs b/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
index da770736c7..3d99b2718e 100644
--- a/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
@@ -28,6 +28,6 @@ namespace MediaBrowser.Model.Syncplay
         /// <summary>
         /// A user is reporting its ping.
         /// </summary>
-        KeepAlive = 5
+        UpdatePing = 5
     }
 }