diff options
| author | David <daullmer@gmail.com> | 2020-07-05 11:10:09 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-07-05 11:10:09 +0200 |
| commit | 5a74a7d3c7696ce419939b0cb2deac1fc45658c7 (patch) | |
| tree | ffd0218da52b8692dadc7a648c9da5836c7f2d3b /Jellyfin.Api/Controllers/ItemsController.cs | |
| parent | 589add16548e407b5b709e8febca03ee666f5e8e (diff) | |
Add additional userId query parameter
Diffstat (limited to 'Jellyfin.Api/Controllers/ItemsController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ItemsController.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs index 639891d8e..4c6c43b0a 100644 --- a/Jellyfin.Api/Controllers/ItemsController.cs +++ b/Jellyfin.Api/Controllers/ItemsController.cs @@ -57,7 +57,8 @@ namespace Jellyfin.Api.Controllers /// <summary> /// Gets items based on a query. /// </summary> - /// <param name="userId">The user id.</param> + /// <param name="uId">The user id supplied in the /Users/{uid}/Items.</param> + /// <param name="userId">The user id supplied as query parameter.</param> /// <param name="maxOfficialRating">Optional filter by maximum official rating (PG, PG-13, TV-MA, etc).</param> /// <param name="hasThemeSong">Optional filter by items with theme songs.</param> /// <param name="hasThemeVideo">Optional filter by items with theme videos.</param> @@ -142,7 +143,8 @@ namespace Jellyfin.Api.Controllers [HttpGet("/Users/{userId}/Items")] [ProducesResponseType(StatusCodes.Status200OK)] public ActionResult<QueryResult<BaseItemDto>> GetItems( - [FromRoute] Guid userId, + [FromRoute] Guid uId, + [FromQuery] Guid userId, [FromQuery] string? maxOfficialRating, [FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeVideo, @@ -223,6 +225,9 @@ namespace Jellyfin.Api.Controllers [FromQuery] bool enableTotalRecordCount = true, [FromQuery] bool? enableImages = true) { + // use user id route parameter over query parameter + userId = (uId != null) ? uId : userId; + var user = userId.Equals(Guid.Empty) ? null : _userManager.GetUserById(userId); var dtoOptions = new DtoOptions() .AddItemFields(fields) |