Merge remote-tracking branch 'upstream/master' into api-upload-subtitle

1 files changed, 10 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index f336f5272..d5344494e 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,7 +1,10 @@
 #pragma warning disable CS1591
 
 using System;
-using MediaBrowser.Model.Events;
+using System.Linq;
+using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Events;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
@@ -10,10 +13,13 @@ namespace MediaBrowser.Model.Activity
     {
         event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
 
-        void Create(ActivityLogEntry entry);
+        Task CreateAsync(ActivityLog entry);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit);
+        QueryResult<ActivityLogEntry> GetPagedResult(int? startIndex, int? limit);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? x, int? y);
+        QueryResult<ActivityLogEntry> GetPagedResult(
+            Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>> func,
+            int? startIndex,
+            int? limit);
     }
 }