Merge branch 'jellyfin:master' into master

3 files changed, 35 insertions, 20 deletions

diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
index 186fd89ee0..f83dde56d4 100644
--- a/MediaBrowser.Model/Activity/ActivityLogEntry.cs
+++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
@@ -3,9 +3,25 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Model.Activity
 {
+    /// <summary>
+    /// An activity log entry.
+    /// </summary>
     public class ActivityLogEntry
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="ActivityLogEntry"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="userId">The user id.</param>
+        public ActivityLogEntry(string name, string type, Guid userId)
+        {
+            Name = name;
+            Type = type;
+            UserId = userId;
+        }
+
+        /// <summary>
         /// Gets or sets the identifier.
         /// </summary>
         /// <value>The identifier.</value>
@@ -21,13 +37,13 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
-        public string Overview { get; set; }
+        public string? Overview { get; set; }
 
         /// <summary>
         /// Gets or sets the short overview.
         /// </summary>
         /// <value>The short overview.</value>
-        public string ShortOverview { get; set; }
+        public string? ShortOverview { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
@@ -39,7 +55,7 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the item identifier.
         /// </summary>
         /// <value>The item identifier.</value>
-        public string ItemId { get; set; }
+        public string? ItemId { get; set; }
 
         /// <summary>
         /// Gets or sets the date.
@@ -57,7 +73,8 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the user primary image tag.
         /// </summary>
         /// <value>The user primary image tag.</value>
-        public string UserPrimaryImageTag { get; set; }
+        [Obsolete("UserPrimaryImageTag is not used.")]
+        public string? UserPrimaryImageTag { get; set; }
 
         /// <summary>
         /// Gets or sets the log severity.
diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index 897d93d790..28073fb8d7 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,5 +1,10 @@
+#pragma warning disable CS1591
+
 using System;
-using MediaBrowser.Model.Events;
+using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Events;
+using Jellyfin.Data.Queries;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
@@ -8,10 +13,15 @@ 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);
+        Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? x, int? y);
+        /// <summary>
+        /// Remove all activity logs before the specified date.
+        /// </summary>
+        /// <param name="startDate">Activity log start date.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        Task CleanAsync(DateTime startDate);
     }
 }
diff --git a/MediaBrowser.Model/Activity/IActivityRepository.cs b/MediaBrowser.Model/Activity/IActivityRepository.cs
deleted file mode 100644
index f0e3b902c4..0000000000
--- a/MediaBrowser.Model/Activity/IActivityRepository.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using MediaBrowser.Model.Querying;
-
-namespace MediaBrowser.Model.Activity
-{
-    public interface IActivityRepository
-    {
-        void Create(ActivityLogEntry entry);
-
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? z, int? startIndex, int? limit);
-    }
-}