4 files changed, 21 insertions, 61 deletions
diff --git a/MediaBrowser.Api/System/ActivityLogService.cs b/MediaBrowser.Api/System/ActivityLogService.cs
index e3a18a933..d55c57ffa 100644
--- a/MediaBrowser.Api/System/ActivityLogService.cs
+++ b/MediaBrowser.Api/System/ActivityLogService.cs
@@ -24,8 +24,10 @@ namespace MediaBrowser.Api.System
         [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
         public int? Limit { get; set; }
 
-        [ApiMember(Name = "MinDate", Description = "Optional. The minimum date. Format = ISO", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        [ApiMember(Name = "MinDate", Description = "Optional. The minimum date. Format = ISO", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string MinDate { get; set; }
+
+        public bool? HasUserId { get; set; }
     }
 
     [Authenticated(Roles = "Admin")]
@@ -44,7 +46,7 @@ namespace MediaBrowser.Api.System
                 (DateTime?)null :
                 DateTime.Parse(request.MinDate, null, DateTimeStyles.RoundtripKind).ToUniversalTime();
 
-            var result = _activityManager.GetActivityLogEntries(minDate, request.StartIndex, request.Limit);
+            var result = _activityManager.GetActivityLogEntries(minDate, request.HasUserId, request.StartIndex, request.Limit);
 
             return ToOptimizedResult(result);
         }
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index f9cac7389..6991244c6 100644
--- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
+++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Model.Logging;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Threading;
 using System.Threading;
 
 namespace MediaBrowser.Api.System
@@ -28,7 +27,7 @@ namespace MediaBrowser.Api.System
         /// </summary>
         private readonly IActivityManager _activityManager;
 
-        public ActivityLogWebSocketListener(ILogger logger, ITimerFactory timerFactory, IActivityManager activityManager) : base(logger, timerFactory)
+        public ActivityLogWebSocketListener(ILogger logger, IActivityManager activityManager) : base(logger)
         {
             _activityManager = activityManager;
             _activityManager.EntryCreated += _activityManager_EntryCreated;
@@ -48,14 +47,7 @@ namespace MediaBrowser.Api.System
         {
             return Task.FromResult(new List<ActivityLogEntry>());
         }
-
-        protected override bool SendOnTimer
-        {
-            get
-            {
-                return false;
-            }
-        }
+        
 
         protected override void Dispose(bool dispose)
         {
diff --git a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
deleted file mode 100644
index 63847f2b5..000000000
--- a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.System;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Threading;
-using System.Threading;
-
-namespace MediaBrowser.Api.System
-{
-    /// <summary>
-    /// Class SystemInfoWebSocketListener
-    /// </summary>
-    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<SystemInfo, WebSocketListenerState>
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "SystemInfo"; }
-        }
-
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly IServerApplicationHost _appHost;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemInfoWebSocketListener" /> class.
-        /// </summary>
-        public SystemInfoWebSocketListener(ILogger logger, IServerApplicationHost appHost, ITimerFactory timerFactory)
-            : base(logger, timerFactory)
-        {
-            _appHost = appHost;
-        }
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>Task{SystemInfo}.</returns>
-        protected override Task<SystemInfo> GetDataToSend(WebSocketListenerState state, CancellationToken cancellationToken)
-        {
-            return _appHost.GetSystemInfo(cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index c0bbf70ea..d2880f735 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Api.System
     }
 
     [Route("/System/Ping", "POST")]
+    [Route("/System/Ping", "GET")]
     public class PingSystem : IReturnVoid
     {
 
@@ -79,6 +80,13 @@ namespace MediaBrowser.Api.System
         public string Name { get; set; }
     }
 
+    [Route("/System/WakeOnLanInfo", "GET", Summary = "Gets wake on lan information")]
+    [Authenticated]
+    public class GetWakeOnLanInfo : IReturn<WakeOnLanInfo[]>
+    {
+
+    }
+
     /// <summary>
     /// Class SystemInfoService
     /// </summary>
@@ -116,6 +124,13 @@ namespace MediaBrowser.Api.System
             return _appHost.Name;
         }
 
+        public object Get(GetWakeOnLanInfo request)
+        {
+            var result = _appHost.GetWakeOnLanInfo();
+
+            return ToOptimizedResult(result);
+        }
+
         public object Get(GetServerLogs request)
         {
             IEnumerable<FileSystemMetadata> files;