Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix Release build

Browse Source
This commit is contained in:
cvium 2022-10-06 14:15:40 +02:00
parent 5dc30c6a6d
commit 6afc911043
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Controllers/ItemsController.cs
View File

@ -152,7 +152,7 @@ namespace Jellyfin.Api.Controllers
/// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the items.</returns> /// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the items.</returns>
[HttpGet("Items")] [HttpGet("Items")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public async Task<ActionResult<QueryResult<BaseItemDto>>> GetItems( public ActionResult<QueryResult<BaseItemDto>> GetItems(
[FromQuery] Guid? userId, [FromQuery] Guid? userId,
[FromQuery] string? maxOfficialRating, [FromQuery] string? maxOfficialRating,
[FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeSong,
@ -627,7 +627,7 @@ namespace Jellyfin.Api.Controllers
/// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the items.</returns> /// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the items.</returns>
[HttpGet("Users/{userId}/Items")] [HttpGet("Users/{userId}/Items")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public Task<ActionResult<QueryResult<BaseItemDto>>> GetItemsByUserId( public ActionResult<QueryResult<BaseItemDto>> GetItemsByUserId(
[FromRoute] Guid userId, [FromRoute] Guid userId,
[FromQuery] string? maxOfficialRating, [FromQuery] string? maxOfficialRating,
[FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeSong,

2
Jellyfin.Api/Controllers/TrailersController.cs
View File

@ -119,7 +119,7 @@ namespace Jellyfin.Api.Controllers
/// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the trailers.</returns> /// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the trailers.</returns>
[HttpGet] [HttpGet]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public Task<ActionResult<QueryResult<BaseItemDto>>> GetTrailers( public ActionResult<QueryResult<BaseItemDto>> GetTrailers(
[FromQuery] Guid? userId, [FromQuery] Guid? userId,
[FromQuery] string? maxOfficialRating, [FromQuery] string? maxOfficialRating,
[FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeSong,

12
Jellyfin.Api/Controllers/UserController.cs
View File

@ -83,11 +83,11 @@ namespace Jellyfin.Api.Controllers
[HttpGet] [HttpGet]
[Authorize(Policy = Policies.DefaultAuthorization)] [Authorize(Policy = Policies.DefaultAuthorization)]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public async Task<ActionResult<IEnumerable<UserDto>>> GetUsers( public ActionResult<IEnumerable<UserDto>> GetUsers(
[FromQuery] bool? isHidden, [FromQuery] bool? isHidden,
[FromQuery] bool? isDisabled) [FromQuery] bool? isDisabled)
{ {
var users = await Get(isHidden, isDisabled, false, false).ConfigureAwait(false); var users = Get(isHidden, isDisabled, false, false);
return Ok(users); return Ok(users);
} }
@ -98,15 +98,15 @@ namespace Jellyfin.Api.Controllers
/// <returns>An <see cref="IEnumerable{UserDto}"/> containing the public users.</returns> /// <returns>An <see cref="IEnumerable{UserDto}"/> containing the public users.</returns>
[HttpGet("Public")] [HttpGet("Public")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public async Task<ActionResult<IEnumerable<UserDto>>> GetPublicUsers() public ActionResult<IEnumerable<UserDto>> GetPublicUsers()
{ {
// If the startup wizard hasn't been completed then just return all users // If the startup wizard hasn't been completed then just return all users
if (!_config.Configuration.IsStartupWizardCompleted) if (!_config.Configuration.IsStartupWizardCompleted)
{ {
return Ok(await Get(false, false, false, false).ConfigureAwait(false)); return Ok(Get(false, false, false, false));
} }
return Ok(await Get(false, false, true, true).ConfigureAwait(false)); return Ok(Get(false, false, true, true));
} }
/// <summary> /// <summary>
@ -552,7 +552,7 @@ namespace Jellyfin.Api.Controllers
return _userManager.GetUserDto(user); return _userManager.GetUserDto(user);
} }
private async Task<IEnumerable<UserDto>> Get(bool? isHidden, bool? isDisabled, bool filterByDevice, bool filterByNetwork) private IEnumerable<UserDto> Get(bool? isHidden, bool? isDisabled, bool filterByDevice, bool filterByNetwork)
{ {
var users = _userManager.Users; var users = _userManager.Users;

3
Jellyfin.Api/Helpers/MediaInfoHelper.cs
View File

@ -313,7 +313,8 @@ namespace Jellyfin.Api.Helpers
} }
// Do this after the above so that StartPositionTicks is set // Do this after the above so that StartPositionTicks is set
SetDeviceSpecificSubtitleInfo(streamInfo, mediaSource, claimsPrincipal.GetToken()); // The token must not be null
SetDeviceSpecificSubtitleInfo(streamInfo, mediaSource, claimsPrincipal.GetToken()!);
mediaSource.DefaultAudioStreamIndex = streamInfo.AudioStreamIndex; mediaSource.DefaultAudioStreamIndex = streamInfo.AudioStreamIndex;
} }