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

Fix merge and build

Browse Source
This commit is contained in:
crobibero
2020-06-13 13:11:41 -06:00
parent 829eb1a849
commit ec3e15db57
11 changed files with 46 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Jellyfin.Api/Controllers/ActivityLogController.cs
View File

@@ -1,6 +1,10 @@
#nullable enable
#pragma warning disable CA1801
using System;
using System.Globalization;
using System.Linq;
using Jellyfin.Api.Constants;
using Jellyfin.Data.Entities;
using MediaBrowser.Model.Activity;
using MediaBrowser.Model.Querying;
using Microsoft.AspNetCore.Authorization;
@@ -44,7 +48,10 @@ namespace Jellyfin.Api.Controllers
[FromQuery] DateTime? minDate,
bool? hasUserId)
{
return _activityManager.GetActivityLogEntries(minDate, hasUserId, startIndex, limit);
var filterFunc = new Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>>(
entries => entries.Where(entry => entry.DateCreated >= minDate));
return _activityManager.GetPagedResult(filterFunc, startIndex, limit);
}
}
}