github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-23 21:47:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace UserId with User in NextUpQuery

Browse source
This commit is contained in:
Bond_009 2024-05-15 18:20:46 +02:00
parent 09f4477510
commit a90316b4d9
4 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Emby.Server.Implementations/TV/TVSeriesManager.cs
View file

@ -19,14 +19,12 @@ namespace Emby.Server.Implementations.TV
{
public class TVSeriesManager : ITVSeriesManager
{
private readonly IUserManager _userManager;
private readonly IUserDataManager _userDataManager;
private readonly ILibraryManager _libraryManager;
private readonly IServerConfigurationManager _configurationManager;
public TVSeriesManager(IUserManager userManager, IUserDataManager userDataManager, ILibraryManager libraryManager, IServerConfigurationManager configurationManager)
public TVSeriesManager(IUserDataManager userDataManager, ILibraryManager libraryManager, IServerConfigurationManager configurationManager)
{
_userManager = userManager;
_userDataManager = userDataManager;
_libraryManager = libraryManager;
_configurationManager = configurationManager;
@ -34,12 +32,7 @@ namespace Emby.Server.Implementations.TV
public QueryResult<BaseItem> GetNextUp(NextUpQuery query, DtoOptions options)
{
var user = _userManager.GetUserById(query.UserId);
if (user is null)
{
throw new ArgumentException("User not found");
}
var user = query.User;
string? presentationUniqueKey = null;
if (!query.SeriesId.IsNullOrEmpty())
@ -83,12 +76,7 @@ namespace Emby.Server.Implementations.TV
public QueryResult<BaseItem> GetNextUp(NextUpQuery request, BaseItem[] parentsFolders, DtoOptions options)
{
var user = _userManager.GetUserById(request.UserId);
if (user is null)
{
throw new ArgumentException("User not found");
}
var user = request.User;
string? presentationUniqueKey = null;
int? limit = request.Limit;

13
Jellyfin.Api/Controllers/TvShowsController.cs
View file

@ -90,7 +90,12 @@ public class TvShowsController : BaseJellyfinApiController
[FromQuery] bool enableResumable = true,
[FromQuery] bool enableRewatching = false)
{
userId = RequestHelpers.GetUserId(User, userId);
var user = _userManager.GetUserById(RequestHelpers.GetUserId(User, userId));
if (user is null)
{
return NotFound();
}
var options = new DtoOptions { Fields = fields }
.AddClientFields(User)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
@ -102,7 +107,7 @@ public class TvShowsController : BaseJellyfinApiController
ParentId = parentId,
SeriesId = seriesId,
StartIndex = startIndex,
UserId = userId.Value,
User = user,
EnableTotalRecordCount = enableTotalRecordCount,
DisableFirstEpisode = disableFirstEpisode,
NextUpDateCutoff = nextUpDateCutoff ?? DateTime.MinValue,
@ -111,10 +116,6 @@ public class TvShowsController : BaseJellyfinApiController
},
options);
var user = userId.IsNullOrEmpty()
? null
: _userManager.GetUserById(userId.Value);
var returnItems = _dtoService.GetBaseItemDtos(result.Items, options, user);
return new QueryResult<BaseItemDto>(

2
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View file

@ -337,7 +337,7 @@ namespace MediaBrowser.Controller.Entities
{
Limit = query.Limit,
StartIndex = query.StartIndex,
UserId = query.User.Id
User = query.User
},
parentFolders,
query.DtoOptions);

7
MediaBrowser.Model/Querying/NextUpQuery.cs
View file

@ -2,6 +2,7 @@
#pragma warning disable CS1591
using System;
using Jellyfin.Data.Entities;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.Querying
@ -19,10 +20,10 @@ namespace MediaBrowser.Model.Querying
}
/// <summary>
/// Gets or sets the user id.
/// Gets or sets the user.
/// </summary>
/// <value>The user id.</value>
public Guid UserId { get; set; }
/// <value>The user.</value>
public User User { get; set; }
/// <summary>
/// Gets or sets the parent identifier.