1 files changed, 25 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index 6febcc2f7..a434edd27 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -1,9 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Querying;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Activity
@@ -26,20 +27,38 @@ namespace Emby.Server.Implementations.Activity
             _userManager = userManager;
         }
 
-        public void Create(ActivityLogEntry entry)
+        public async Task Create(ActivityLogEntry entry)
         {
             entry.Date = DateTime.UtcNow;
 
-            _repo.Create(entry);
+            await _repo.CreateAsync(entry);
 
             EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(entry));
         }
 
-        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
+        public IEnumerable<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
-            var result = _repo.GetActivityLogEntries(minDate, hasUserId, startIndex, limit);
+            var result = _repo.GetActivityLogEntries();
 
-            foreach (var item in result.Items.Where(i => !i.UserId.Equals(Guid.Empty)))
+            if (minDate.HasValue)
+            {
+                result = result.Where(x => x.Date >= minDate.Value);
+            }
+            if (hasUserId.HasValue)
+            {
+                result = result.Where(x => x.UserId != null && x.UserId != Guid.Empty);
+            }
+            if (startIndex.HasValue)
+            {
+                result = result.Where(x => x.Id >= startIndex.Value);
+            }
+            if (limit.HasValue)
+            {
+                result = result.Take(limit.Value);
+            }
+
+            // Add images for each user
+            foreach (var item in result)
             {
                 var user = _userManager.GetUserById(item.UserId);
 
@@ -52,10 +71,5 @@ namespace Emby.Server.Implementations.Activity
 
             return result;
         }
-
-        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
-        {
-            return GetActivityLogEntries(minDate, null, startIndex, limit);
-        }
     }
 }