diff options
| author | crobibero <cody@robibe.ro> | 2020-09-06 14:34:31 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-06 14:34:31 -0600 |
| commit | eab92a0b0124c2e89a8e11d4d6a8031f17834e36 (patch) | |
| tree | d86b3903849cbff19c3a11198bc2e14a6607c18e /Jellyfin.Api/Controllers/ChannelsController.cs | |
| parent | d5eb246557f9c943d8e3c5ddcc357ef351425deb (diff) | |
| parent | 99bbbea9e24d3e34041fdd97f9f9efa0dad58c9a (diff) | |
Merge remote-tracking branch 'upstream/master' into api-stream-return
Diffstat (limited to 'Jellyfin.Api/Controllers/ChannelsController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ChannelsController.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/ChannelsController.cs b/Jellyfin.Api/Controllers/ChannelsController.cs index bdd7dfd96..33a969f85 100644 --- a/Jellyfin.Api/Controllers/ChannelsController.cs +++ b/Jellyfin.Api/Controllers/ChannelsController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -90,7 +91,7 @@ namespace Jellyfin.Api.Controllers /// <response code="200">Channel features returned.</response> /// <returns>An <see cref="OkResult"/> containing the channel features.</returns> [HttpGet("{channelId}/Features")] - public ActionResult<ChannelFeatures> GetChannelFeatures([FromRoute] string channelId) + public ActionResult<ChannelFeatures> GetChannelFeatures([FromRoute, Required] string channelId) { return _channelManager.GetChannelFeatures(channelId); } @@ -114,7 +115,7 @@ namespace Jellyfin.Api.Controllers /// </returns> [HttpGet("{channelId}/Items")] public async Task<ActionResult<QueryResult<BaseItemDto>>> GetChannelItems( - [FromRoute] Guid channelId, + [FromRoute, Required] Guid channelId, [FromQuery] Guid? folderId, [FromQuery] Guid? userId, [FromQuery] int? startIndex, |