Revert "Merge pull request #452 from Bond-009/activitydb"

This reverts commit 48ad18d12baeeb42ec0ec7df9473330dcbc76754, reversing
changes made to fe197415cac19c0e4005c52761c5e7a37b8a4557.

1 files changed, 12 insertions, 26 deletions

diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index 8fcacb002..6febcc2f7 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -1,10 +1,9 @@
 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
@@ -27,38 +26,20 @@ namespace Emby.Server.Implementations.Activity
             _userManager = userManager;
         }
 
-        public async Task CreateAsync(ActivityLogEntry entry)
+        public void Create(ActivityLogEntry entry)
         {
             entry.Date = DateTime.UtcNow;
 
-            await _repo.CreateAsync(entry);
+            _repo.Create(entry);
 
             EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(entry));
         }
 
-        public IEnumerable<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
-            var result = _repo.GetActivityLogEntries();
+            var result = _repo.GetActivityLogEntries(minDate, hasUserId, startIndex, limit);
 
-            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)
+            foreach (var item in result.Items.Where(i => !i.UserId.Equals(Guid.Empty)))
             {
                 var user = _userManager.GetUserById(item.UserId);
 
@@ -69,7 +50,12 @@ namespace Emby.Server.Implementations.Activity
                 }
             }
 
-            return result.AsEnumerable();
+            return result;
+        }
+
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
+        {
+            return GetActivityLogEntries(minDate, null, startIndex, limit);
         }
     }
 }