aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations/Activity/ActivityManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Activity/ActivityManager.cs21
1 files changed, 19 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
index 7b123bad2..0904c92f1 100644
--- a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
@@ -1,10 +1,12 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Controller.Activity;
+using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Activity;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Querying;
using System;
+using System.Linq;
using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.Activity
@@ -15,11 +17,13 @@ namespace MediaBrowser.Server.Implementations.Activity
private readonly IActivityRepository _repo;
private readonly ILogger _logger;
+ private readonly IUserManager _userManager;
- public ActivityManager(ILogger logger, IActivityRepository repo)
+ public ActivityManager(ILogger logger, IActivityRepository repo, IUserManager userManager)
{
_logger = logger;
_repo = repo;
+ _userManager = userManager;
}
public async Task Create(ActivityLogEntry entry)
@@ -34,7 +38,20 @@ namespace MediaBrowser.Server.Implementations.Activity
public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
{
- return _repo.GetActivityLogEntries(minDate, startIndex, limit);
+ var result = _repo.GetActivityLogEntries(minDate, startIndex, limit);
+
+ foreach (var item in result.Items.Where(i => !string.IsNullOrWhiteSpace(i.UserId)))
+ {
+ var user = _userManager.GetUserById(item.UserId);
+
+ if (user != null)
+ {
+ var dto = _userManager.GetUserDto(user);
+ item.UserPrimaryImageTag = dto.PrimaryImageTag;
+ }
+ }
+
+ return result;
}
}
}