michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove unnecessary assembly, update casing, enable nullable reference types on notification DTOs.

Browse Source
This commit is contained in:
ZadenRB 2020-04-15 09:29:29 -06:00
parent ad1c880751
commit 558b50a094
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Jellyfin.Api/Controllers/NotificationsController.cs
View File

@ -36,14 +36,14 @@ namespace Jellyfin.Api.Controllers
/// <summary>
/// Endpoint for getting a user's notifications.
/// </summary>
/// <param name="userID">The UserID.</param>
/// <param name="userId">The user's ID.</param>
/// <param name="isRead">An optional filter by IsRead.</param>
/// <param name="startIndex">The optional index to start at. All notifications with a lower index will be dropped from the results.</param>
/// <param name="limit">An optional limit on the number of notifications returned.</param>
/// <returns>A read-only list of all of the user's notifications.</returns>
[HttpGet("{UserID}")]
public IReadOnlyList<NotificationDto> GetNotifications(
[FromRoute] string userID,
[FromRoute] string userId,
[FromQuery] bool? isRead,
[FromQuery] int? startIndex,
[FromQuery] int? limit)
@ -54,11 +54,11 @@ namespace Jellyfin.Api.Controllers
/// <summary>
/// Endpoint for getting a user's notification summary.
/// </summary>
/// <param name="userID">The userID.</param>
/// <param name="userId">The user's ID.</param>
/// <returns>Notifications summary for the user.</returns>
[HttpGet("{UserID}/Summary")]
public NotificationsSummaryDto GetNotificationsSummary(
[FromRoute] string userID)
[FromRoute] string userId)
{
return new NotificationsSummaryDto();
}
@ -95,14 +95,14 @@ namespace Jellyfin.Api.Controllers
[FromForm] string name,
[FromForm] string description,
[FromForm] string? url,
[FromForm] NotificationLevel level)
[FromForm] NotificationLevel? level)
{
var notification = new NotificationRequest
{
Name = name,
Description = description,
Url = url,
Level = level,
Level = level ?? NotificationLevel.Normal,
UserIds = _userManager.Users.Where(i => i.Policy.IsAdministrator).Select(i => i.Id).ToArray(),
Date = DateTime.UtcNow,
};
@ -113,11 +113,11 @@ namespace Jellyfin.Api.Controllers
/// <summary>
/// Endpoint to set notifications as read.
/// </summary>
/// <param name="userID">The userID.</param>
/// <param name="userId">The userID.</param>
/// <param name="ids">The IDs of notifications which should be set as read.</param>
[HttpPost("{UserID}/Read")]
public void SetRead(
[FromRoute] string userID,
[FromRoute] string userId,
[FromForm] List<string> ids)
{
}
@ -125,11 +125,11 @@ namespace Jellyfin.Api.Controllers
/// <summary>
/// Endpoint to set notifications as unread.
/// </summary>
/// <param name="userID">The userID.</param>
/// <param name="userId">The userID.</param>
/// <param name="ids">The IDs of notifications which should be set as unread.</param>
[HttpPost("{UserID}/Unread")]
public void SetUnread(
[FromRoute] string userID,
[FromRoute] string userId,
[FromForm] List<string> ids)
{
}

16
Jellyfin.Api/Models/NotificationDtos/NotificationDto.cs
View File

@ -1,3 +1,5 @@
#nullable enable
using System;
using MediaBrowser.Model.Notifications;
@ -24,28 +26,28 @@ namespace Jellyfin.Api.Models.NotificationDtos
public DateTime Date { get; set; }
/// <summary>
/// Gets or sets a value indicating whether the notification has been read.
/// Gets or sets a value indicating whether the notification has been read. Defaults to false.
/// </summary>
public bool IsRead { get; set; }
public bool IsRead { get; set; } = false;
/// <summary>
/// Gets or sets the notification's name.
/// Gets or sets the notification's name. Defaults to an empty string.
/// </summary>
public string Name { get; set; } = string.Empty;
/// <summary>
/// Gets or sets the notification's description.
/// Gets or sets the notification's description. Defaults to an empty string.
/// </summary>
public string Description { get; set; } = string.Empty;
/// <summary>
/// Gets or sets the notification's URL.
/// Gets or sets the notification's URL. Defaults to null.
/// </summary>
public string Url { get; set; } = string.Empty;
public string? Url { get; set; }
/// <summary>
/// Gets or sets the notification level.
/// </summary>
public NotificationLevel Level { get; set; }
public NotificationLevel? Level { get; set; }
}
}

4
Jellyfin.Api/Models/NotificationDtos/NotificationsSummaryDto.cs
View File

@ -1,3 +1,5 @@
#nullable enable
using MediaBrowser.Model.Notifications;
namespace Jellyfin.Api.Models.NotificationDtos
@ -15,6 +17,6 @@ namespace Jellyfin.Api.Models.NotificationDtos
/// <summary>
/// Gets or sets the maximum unread notification level.
/// </summary>
public NotificationLevel MaxUnreadNotificationLevel { get; set; }
public NotificationLevel? MaxUnreadNotificationLevel { get; set; }
}
}

1
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
View File

@ -71,7 +71,6 @@ namespace Jellyfin.Server.Extensions
// Clear app parts to avoid other assemblies being picked up
.ConfigureApplicationPartManager(a => a.ApplicationParts.Clear())
.AddApplicationPart(typeof(StartupController).Assembly)
.AddApplicationPart(typeof(NotificationsController).Assembly)
.AddControllersAsServices();
}