The Free Software Media System - Server Backend & API
Remove DtoExtensions.AddClientFields (#15638)
Niels van Velzen6c507b77aecc
diff --git a/Jellyfin.Api/Controllers/ArtistsController.cs b/Jellyfin.Api/Controllers/ArtistsController.csindex 7ba75dc243..642790f942 100644--- a/Jellyfin.Api/Controllers/ArtistsController.cs+++ b/Jellyfin.Api/Controllers/ArtistsController.cs@@ -122,7 +122,6 @@ public class ArtistsController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);User? user = null;@@ -326,7 +325,6 @@ public class ArtistsController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);User? user = null;@@ -467,7 +465,7 @@ public class ArtistsController : BaseJellyfinApiControllerpublic ActionResult<BaseItemDto> GetArtistByName([FromRoute, Required] string name, [FromQuery] Guid? userId){userId = RequestHelpers.GetUserId(User, userId);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var item = _libraryManager.GetArtist(name, dtoOptions);diff --git a/Jellyfin.Api/Controllers/CollectionController.cs b/Jellyfin.Api/Controllers/CollectionController.csindex c37f376335..227487b390 100644--- a/Jellyfin.Api/Controllers/CollectionController.cs+++ b/Jellyfin.Api/Controllers/CollectionController.cs@@ -65,7 +65,7 @@ public class CollectionController : BaseJellyfinApiControllerUserIds = new[] { userId }}).ConfigureAwait(false);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var dto = _dtoService.GetBaseItemDto(item, dtoOptions);diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.csindex dd60d01e0c..456e643fd7 100644--- a/Jellyfin.Api/Controllers/GenresController.cs+++ b/Jellyfin.Api/Controllers/GenresController.cs@@ -94,7 +94,6 @@ public class GenresController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);User? user = userId.IsNullOrEmpty()@@ -159,8 +158,7 @@ public class GenresController : BaseJellyfinApiControllerpublic ActionResult<BaseItemDto> GetGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId){userId = RequestHelpers.GetUserId(User, userId);- var dtoOptions = new DtoOptions()- .AddClientFields(User);+ var dtoOptions = new DtoOptions();Genre? item;if (genreName.Contains(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase))diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.csindex c4b9767565..301954561d 100644--- a/Jellyfin.Api/Controllers/InstantMixController.cs+++ b/Jellyfin.Api/Controllers/InstantMixController.cs@@ -90,7 +90,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -134,7 +133,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -178,7 +176,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -214,7 +211,6 @@ public class InstantMixController : BaseJellyfinApiController? null: _userManager.GetUserById(userId.Value);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromGenres(new[] { name }, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -258,7 +254,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -302,7 +297,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);@@ -385,7 +379,6 @@ public class InstantMixController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);return GetResult(items, user, limit, dtoOptions);diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.csindex a491283363..9674ecd092 100644--- a/Jellyfin.Api/Controllers/ItemsController.cs+++ b/Jellyfin.Api/Controllers/ItemsController.cs@@ -268,7 +268,6 @@ public class ItemsController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);if (includeItemTypes.Length == 1@@ -849,7 +848,6 @@ public class ItemsController : BaseJellyfinApiControllervar parentIdGuid = parentId ?? Guid.Empty;var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var ancestorIds = Array.Empty<Guid>();diff --git a/Jellyfin.Api/Controllers/LibraryController.cs b/Jellyfin.Api/Controllers/LibraryController.csindex 4c9cc2b1e8..4e898c00e8 100644--- a/Jellyfin.Api/Controllers/LibraryController.cs+++ b/Jellyfin.Api/Controllers/LibraryController.cs@@ -187,7 +187,7 @@ public class LibraryController : BaseJellyfinApiControlleritem = parent;}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var items = themeItems.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item)).ToArray();@@ -260,7 +260,7 @@ public class LibraryController : BaseJellyfinApiControlleritem = parent;}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var items = themeItems.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item)).ToArray();@@ -496,7 +496,7 @@ public class LibraryController : BaseJellyfinApiControllervar baseItemDtos = new List<BaseItemDto>();- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();BaseItem? parent = item.GetParent();while (parent is not null)@@ -556,7 +556,7 @@ public class LibraryController : BaseJellyfinApiControlleritems = items.Where(i => i.IsHidden == val).ToList();}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var resultArray = _dtoService.GetBaseItemDtos(items, dtoOptions);return new QueryResult<BaseItemDto>(resultArray);}@@ -747,8 +747,7 @@ public class LibraryController : BaseJellyfinApiControllerreturn new QueryResult<BaseItemDto>();}- var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User);+ var dtoOptions = new DtoOptions { Fields = fields };var program = item as IHasProgramAttributes;bool? isMovie = item is Movie || (program is not null && program.IsMovie) || item is Trailer;diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.csindex 10f1789ad8..94f62a0713 100644--- a/Jellyfin.Api/Controllers/LiveTvController.cs+++ b/Jellyfin.Api/Controllers/LiveTvController.cs@@ -170,7 +170,6 @@ public class LiveTvController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var channelResult = _liveTvManager.GetInternalChannels(@@ -242,8 +241,7 @@ public class LiveTvController : BaseJellyfinApiControllerreturn NotFound();}- var dtoOptions = new DtoOptions()- .AddClientFields(User);+ var dtoOptions = new DtoOptions();return _dtoService.GetBaseItemDto(item, dtoOptions, user);}@@ -297,7 +295,6 @@ public class LiveTvController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);return await _liveTvManager.GetRecordingsAsync(@@ -444,8 +441,7 @@ public class LiveTvController : BaseJellyfinApiControllerreturn NotFound();}- var dtoOptions = new DtoOptions()- .AddClientFields(User);+ var dtoOptions = new DtoOptions();return _dtoService.GetBaseItemDto(item, dtoOptions, user);}@@ -635,7 +631,6 @@ public class LiveTvController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);}@@ -690,7 +685,6 @@ public class LiveTvController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = body.Fields ?? [] }- .AddClientFields(User).AddAdditionalDtoOptions(body.EnableImages, body.EnableUserData, body.ImageTypeLimit, body.EnableImageTypes ?? []);return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);}@@ -760,7 +754,6 @@ public class LiveTvController : BaseJellyfinApiController};var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);return await _liveTvManager.GetRecommendedProgramsAsync(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);}diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.csindex 363acf815a..ace9a06395 100644--- a/Jellyfin.Api/Controllers/MoviesController.cs+++ b/Jellyfin.Api/Controllers/MoviesController.cs@@ -74,8 +74,7 @@ public class MoviesController : BaseJellyfinApiControllervar user = userId.IsNullOrEmpty()? null: _userManager.GetUserById(userId.Value);- var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User);+ var dtoOptions = new DtoOptions { Fields = fields };var categories = new List<RecommendationDto>();diff --git a/Jellyfin.Api/Controllers/MusicGenresController.cs b/Jellyfin.Api/Controllers/MusicGenresController.csindex 1e45e53ca1..a6427df67a 100644--- a/Jellyfin.Api/Controllers/MusicGenresController.cs+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs@@ -94,7 +94,6 @@ public class MusicGenresController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);User? user = userId.IsNullOrEmpty()@@ -148,7 +147,7 @@ public class MusicGenresController : BaseJellyfinApiControllerpublic ActionResult<BaseItemDto> GetMusicGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId){userId = RequestHelpers.GetUserId(User, userId);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();MusicGenre? item;diff --git a/Jellyfin.Api/Controllers/PersonsController.cs b/Jellyfin.Api/Controllers/PersonsController.csindex 4d12dc18fc..438d054a4c 100644--- a/Jellyfin.Api/Controllers/PersonsController.cs+++ b/Jellyfin.Api/Controllers/PersonsController.cs@@ -81,7 +81,6 @@ public class PersonsController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);User? user = userId.IsNullOrEmpty()@@ -121,8 +120,7 @@ public class PersonsController : BaseJellyfinApiControllerpublic ActionResult<BaseItemDto> GetPerson([FromRoute, Required] string name, [FromQuery] Guid? userId){userId = RequestHelpers.GetUserId(User, userId);- var dtoOptions = new DtoOptions()- .AddClientFields(User);+ var dtoOptions = new DtoOptions();var item = _libraryManager.GetPerson(name);if (item is null)diff --git a/Jellyfin.Api/Controllers/PlaylistsController.cs b/Jellyfin.Api/Controllers/PlaylistsController.csindex 79c71d23a4..59e6fd779d 100644--- a/Jellyfin.Api/Controllers/PlaylistsController.cs+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs@@ -548,7 +548,6 @@ public class PlaylistsController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var dtos = _dtoService.GetBaseItemDtos(items.Select(i => i.Item2).ToList(), dtoOptions, user);diff --git a/Jellyfin.Api/Controllers/StudiosController.cs b/Jellyfin.Api/Controllers/StudiosController.csindex 52cb87e72c..ad08dc5f9b 100644--- a/Jellyfin.Api/Controllers/StudiosController.cs+++ b/Jellyfin.Api/Controllers/StudiosController.cs@@ -89,7 +89,6 @@ public class StudiosController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);User? user = userId.IsNullOrEmpty()@@ -142,7 +141,7 @@ public class StudiosController : BaseJellyfinApiControllerpublic ActionResult<BaseItemDto> GetStudio([FromRoute, Required] string name, [FromQuery] Guid? userId){userId = RequestHelpers.GetUserId(User, userId);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var item = _libraryManager.GetStudio(name);if (!userId.IsNullOrEmpty())diff --git a/Jellyfin.Api/Controllers/SuggestionsController.cs b/Jellyfin.Api/Controllers/SuggestionsController.csindex 52982c362d..e9e404076f 100644--- a/Jellyfin.Api/Controllers/SuggestionsController.cs+++ b/Jellyfin.Api/Controllers/SuggestionsController.cs@@ -77,7 +77,7 @@ public class SuggestionsController : BaseJellyfinApiControlleruser = _userManager.GetUserById(requestUserId);}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var result = _libraryManager.GetItemsResult(new InternalItemsQuery(user){OrderBy = new[] { (ItemSortBy.Random, SortOrder.Descending) },diff --git a/Jellyfin.Api/Controllers/TvShowsController.cs b/Jellyfin.Api/Controllers/TvShowsController.csindex 0f08854d24..2817e3cbc7 100644--- a/Jellyfin.Api/Controllers/TvShowsController.cs+++ b/Jellyfin.Api/Controllers/TvShowsController.cs@@ -99,7 +99,6 @@ public class TvShowsController : BaseJellyfinApiController}var options = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var result = _tvSeriesManager.GetNextUp(@@ -161,7 +160,6 @@ public class TvShowsController : BaseJellyfinApiControllervar parentIdGuid = parentId ?? Guid.Empty;var options = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)@@ -231,7 +229,6 @@ public class TvShowsController : BaseJellyfinApiControllerList<BaseItem> episodes;var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var shouldIncludeMissingEpisodes = (user is not null && user.DisplayMissingEpisodes) || User.GetIsApiKey();@@ -360,7 +357,6 @@ public class TvShowsController : BaseJellyfinApiController});var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user);diff --git a/Jellyfin.Api/Controllers/UserLibraryController.cs b/Jellyfin.Api/Controllers/UserLibraryController.csindex 0e04beb14e..37ac8d4fc5 100644--- a/Jellyfin.Api/Controllers/UserLibraryController.cs+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs@@ -94,7 +94,7 @@ public class UserLibraryController : BaseJellyfinApiControllerawait RefreshItemOnDemandIfNeeded(item).ConfigureAwait(false);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();return _dtoService.GetBaseItemDto(item, dtoOptions, user);}@@ -133,7 +133,7 @@ public class UserLibraryController : BaseJellyfinApiController}var item = _libraryManager.GetUserRootFolder();- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();return _dtoService.GetBaseItemDto(item, dtoOptions, user);}@@ -180,7 +180,7 @@ public class UserLibraryController : BaseJellyfinApiController}var items = await _libraryManager.GetIntros(item, user).ConfigureAwait(false);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray();return new QueryResult<BaseItemDto>(dtos);@@ -422,7 +422,7 @@ public class UserLibraryController : BaseJellyfinApiControllerreturn NotFound();}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();if (item is IHasTrailers hasTrailers){var trailers = hasTrailers.LocalTrailers;@@ -478,7 +478,7 @@ public class UserLibraryController : BaseJellyfinApiControllerreturn NotFound();}- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();return Ok(item.GetExtras()@@ -549,7 +549,6 @@ public class UserLibraryController : BaseJellyfinApiController}var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);var list = _userViewManager.GetLatestItems(diff --git a/Jellyfin.Api/Controllers/UserViewsController.cs b/Jellyfin.Api/Controllers/UserViewsController.csindex 64b2dffb32..ed4bba2bb1 100644--- a/Jellyfin.Api/Controllers/UserViewsController.cs+++ b/Jellyfin.Api/Controllers/UserViewsController.cs@@ -86,7 +86,7 @@ public class UserViewsController : BaseJellyfinApiControllervar folders = _userViewManager.GetUserViews(query);- var dtoOptions = new DtoOptions().AddClientFields(User);+ var dtoOptions = new DtoOptions();dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.PrimaryImageAspectRatio, ItemFields.DisplayPreferencesId];var dtos = Array.ConvertAll(folders, i => _dtoService.GetBaseItemDto(i, dtoOptions, user));diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.csindex 97f3239bbc..e7c6f23ce5 100644--- a/Jellyfin.Api/Controllers/VideosController.cs+++ b/Jellyfin.Api/Controllers/VideosController.cs@@ -111,7 +111,6 @@ public class VideosController : BaseJellyfinApiController}var dtoOptions = new DtoOptions();- dtoOptions = dtoOptions.AddClientFields(User);BaseItemDto[] items;if (item is Video video)diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.csindex 5495f60d88..685334a9f0 100644--- a/Jellyfin.Api/Controllers/YearsController.cs+++ b/Jellyfin.Api/Controllers/YearsController.cs@@ -89,7 +89,6 @@ public class YearsController : BaseJellyfinApiController{userId = RequestHelpers.GetUserId(User, userId);var dtoOptions = new DtoOptions { Fields = fields }- .AddClientFields(User).AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);User? user = userId.IsNullOrEmpty()@@ -182,8 +181,7 @@ public class YearsController : BaseJellyfinApiControllerreturn NotFound();}- var dtoOptions = new DtoOptions()- .AddClientFields(User);+ var dtoOptions = new DtoOptions();if (!userId.IsNullOrEmpty()){diff --git a/Jellyfin.Api/Extensions/DtoExtensions.cs b/Jellyfin.Api/Extensions/DtoExtensions.csindex f919a4707d..9c24be82ea 100644--- a/Jellyfin.Api/Extensions/DtoExtensions.cs+++ b/Jellyfin.Api/Extensions/DtoExtensions.cs@@ -1,10 +1,6 @@-using System;using System.Collections.Generic;-using System.Security.Claims;-using Jellyfin.Extensions;using MediaBrowser.Controller.Dto;using MediaBrowser.Model.Entities;-using MediaBrowser.Model.Querying;namespace Jellyfin.Api.Extensions;@@ -13,55 +9,6 @@ namespace Jellyfin.Api.Extensions;/// </summary>public static class DtoExtensions{- /// <summary>- /// Add additional fields depending on client.- /// </summary>- /// <remarks>- /// Use in place of GetDtoOptions.- /// Legacy order: 2.- /// </remarks>- /// <param name="dtoOptions">DtoOptions object.</param>- /// <param name="user">Current claims principal.</param>- /// <returns>Modified DtoOptions object.</returns>- internal static DtoOptions AddClientFields(- this DtoOptions dtoOptions, ClaimsPrincipal user)- {- string? client = user.GetClient();-- // No client in claim- if (string.IsNullOrEmpty(client))- {- return dtoOptions;- }-- if (!dtoOptions.ContainsField(ItemFields.RecursiveItemCount))- {- if (client.Contains("kodi", StringComparison.OrdinalIgnoreCase) ||- client.Contains("wmc", StringComparison.OrdinalIgnoreCase) ||- client.Contains("media center", StringComparison.OrdinalIgnoreCase) ||- client.Contains("classic", StringComparison.OrdinalIgnoreCase))- {- dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.RecursiveItemCount];- }- }-- if (!dtoOptions.ContainsField(ItemFields.ChildCount))- {- if (client.Contains("kodi", StringComparison.OrdinalIgnoreCase) ||- client.Contains("wmc", StringComparison.OrdinalIgnoreCase) ||- client.Contains("media center", StringComparison.OrdinalIgnoreCase) ||- client.Contains("classic", StringComparison.OrdinalIgnoreCase) ||- client.Contains("roku", StringComparison.OrdinalIgnoreCase) ||- client.Contains("samsung", StringComparison.OrdinalIgnoreCase) ||- client.Contains("androidtv", StringComparison.OrdinalIgnoreCase))- {- dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.ChildCount];- }- }-- return dtoOptions;- }-/// <summary>/// Add additional DtoOptions./// </summary>