starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into api-stream-return

Browse Source
This commit is contained in:
crobibero
2020-09-09 12:02:05 -06:00
parent eab92a0b01 b76d4ba454
commit 612e135c8c
74 changed files with 1279 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,7 +448,7 @@ namespace Jellyfin.Api.Controllers
[HttpGet("Timers/{timerId}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[Authorize(Policy = Policies.DefaultAuthorization)]
public async Task<ActionResult<TimerInfoDto>> GetTimer(string timerId)
public async Task<ActionResult<TimerInfoDto>> GetTimer([FromRoute, Required] string timerId)
{
return await _liveTvManager.GetTimer(timerId, CancellationToken.None).ConfigureAwait(false);
}