starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix activity log query.

Browse Source
This commit is contained in:
Patrick Barron
2020-10-05 22:51:52 -04:00
parent 4d7e7d6331
commit d4a492ef93
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -45,7 +45,9 @@ namespace Jellyfin.Server.Implementations.Activity
{
await using var dbContext = _provider.CreateContext();
IQueryable<ActivityLog> entries = dbContext.ActivityLogs.OrderByDescending(entry => entry.DateCreated);
IQueryable<ActivityLog> entries = dbContext.ActivityLogs
.AsQueryable()
.OrderByDescending(entry => entry.DateCreated);
if (query.MinDate.HasValue)
{
@@ -59,10 +61,11 @@ namespace Jellyfin.Server.Implementations.Activity
return new QueryResult<ActivityLogEntry>
{
Items = await entries.Skip(query.StartIndex ?? 0)
Items = await entries
.Skip(query.StartIndex ?? 0)
.Take(query.Limit ?? 100)
.AsAsyncEnumerable()
.Select(ConvertToOldModel)
.AsQueryable()
.ToListAsync()
.ConfigureAwait(false),
TotalRecordCount = await entries.CountAsync().ConfigureAwait(false)