Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 27 insertions, 27 deletions

diff --git a/Jellyfin.Api/Controllers/MusicGenresController.cs b/Jellyfin.Api/Controllers/MusicGenresController.cs
index 9ac74f199..0d319137a 100644
--- a/Jellyfin.Api/Controllers/MusicGenresController.cs
+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs
@@ -83,31 +83,31 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] double? minCommunityRating,
             [FromQuery] int? startIndex,
             [FromQuery] int? limit,
-            [FromQuery] string searchTerm,
-            [FromQuery] string parentId,
-            [FromQuery] string fields,
-            [FromQuery] string excludeItemTypes,
-            [FromQuery] string includeItemTypes,
-            [FromQuery] string filters,
+            [FromQuery] string? searchTerm,
+            [FromQuery] string? parentId,
+            [FromQuery] string? fields,
+            [FromQuery] string? excludeItemTypes,
+            [FromQuery] string? includeItemTypes,
+            [FromQuery] string? filters,
             [FromQuery] bool? isFavorite,
-            [FromQuery] string mediaTypes,
-            [FromQuery] string genres,
-            [FromQuery] string genreIds,
-            [FromQuery] string officialRatings,
-            [FromQuery] string tags,
-            [FromQuery] string years,
+            [FromQuery] string? mediaTypes,
+            [FromQuery] string? genres,
+            [FromQuery] string? genreIds,
+            [FromQuery] string? officialRatings,
+            [FromQuery] string? tags,
+            [FromQuery] string? years,
             [FromQuery] bool? enableUserData,
             [FromQuery] int? imageTypeLimit,
-            [FromQuery] string enableImageTypes,
-            [FromQuery] string person,
-            [FromQuery] string personIds,
-            [FromQuery] string personTypes,
-            [FromQuery] string studios,
-            [FromQuery] string studioIds,
-            [FromQuery] Guid userId,
-            [FromQuery] string nameStartsWithOrGreater,
-            [FromQuery] string nameStartsWith,
-            [FromQuery] string nameLessThan,
+            [FromQuery] string? enableImageTypes,
+            [FromQuery] string? person,
+            [FromQuery] string? personIds,
+            [FromQuery] string? personTypes,
+            [FromQuery] string? studios,
+            [FromQuery] string? studioIds,
+            [FromQuery] Guid? userId,
+            [FromQuery] string? nameStartsWithOrGreater,
+            [FromQuery] string? nameStartsWith,
+            [FromQuery] string? nameLessThan,
             [FromQuery] bool? enableImages = true,
             [FromQuery] bool enableTotalRecordCount = true)
         {
@@ -119,9 +119,9 @@ namespace Jellyfin.Api.Controllers
             User? user = null;
             BaseItem parentItem;
 
-            if (!userId.Equals(Guid.Empty))
+            if (userId.HasValue && !userId.Equals(Guid.Empty))
             {
-                user = _userManager.GetUserById(userId);
+                user = _userManager.GetUserById(userId.Value);
                 parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.GetUserRootFolder() : _libraryManager.GetItemById(parentId);
             }
             else
@@ -258,7 +258,7 @@ namespace Jellyfin.Api.Controllers
         /// <returns>An <see cref="OkResult"/> containing a <see cref="BaseItemDto"/> with the music genre.</returns>
         [HttpGet("{genreName}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<BaseItemDto> GetMusicGenre([FromRoute] string genreName, [FromQuery] Guid userId)
+        public ActionResult<BaseItemDto> GetMusicGenre([FromRoute] string genreName, [FromQuery] Guid? userId)
         {
             var dtoOptions = new DtoOptions().AddClientFields(Request);
 
@@ -273,9 +273,9 @@ namespace Jellyfin.Api.Controllers
                 item = _libraryManager.GetMusicGenre(genreName);
             }
 
-            if (!userId.Equals(Guid.Empty))
+            if (userId.HasValue && !userId.Equals(Guid.Empty))
             {
-                var user = _userManager.GetUserById(userId);
+                var user = _userManager.GetUserById(userId.Value);
 
                 return _dtoService.GetBaseItemDto(item, dtoOptions, user);
             }