diff options
| author | Mark Cilia Vincenti <markciliavincenti@gmail.com> | 2024-01-27 21:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-27 21:31:12 +0100 |
| commit | 3fa86a45595c604a0211ba9ffbc4c7f78f9de881 (patch) | |
| tree | 006a774c8d2464b53f3f6efc26c9549e4ab7d5ce /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 179965e7749794513be0b832e9d8fb31444e9779 (diff) | |
| parent | 054f42332d8e0c45fb899eeaef982aa0fd549397 (diff) | |
Merge branch 'jellyfin:master' into AsyncKeyedLock-migration
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index c231c147f..e6c319869 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -11,6 +11,7 @@ using Jellyfin.Api.Constants; using Jellyfin.Api.Extensions; using Jellyfin.Api.Helpers; using Jellyfin.Api.ModelBinders; +using Jellyfin.Extensions; using MediaBrowser.Common.Api; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; @@ -96,12 +97,12 @@ public class VideosController : BaseJellyfinApiController public ActionResult<QueryResult<BaseItemDto>> GetAdditionalPart([FromRoute, Required] Guid itemId, [FromQuery] Guid? userId) { userId = RequestHelpers.GetUserId(User, userId); - var user = userId.Value.Equals(default) + var user = userId.IsNullOrEmpty() ? null : _userManager.GetUserById(userId.Value); - var item = itemId.Equals(default) - ? (userId.Value.Equals(default) + var item = itemId.IsEmpty() + ? (userId.IsNullOrEmpty() ? _libraryManager.RootFolder : _libraryManager.GetUserRootFolder()) : _libraryManager.GetItemById(itemId); |
