mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-20 09:04:42 +01:00
added send to user mode
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using MediaBrowser.Controller.Localization;
|
||||
using MediaBrowser.Controller;
|
||||
using MediaBrowser.Controller.Localization;
|
||||
using MediaBrowser.Controller.Notifications;
|
||||
using MediaBrowser.Model.Configuration;
|
||||
using MediaBrowser.Model.Notifications;
|
||||
@@ -11,22 +12,18 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
public class CoreNotificationTypes : INotificationTypeFactory
|
||||
{
|
||||
private readonly ILocalizationManager _localization;
|
||||
private readonly IServerApplicationHost _appHost;
|
||||
|
||||
public CoreNotificationTypes(ILocalizationManager localization)
|
||||
public CoreNotificationTypes(ILocalizationManager localization, IServerApplicationHost appHost)
|
||||
{
|
||||
_localization = localization;
|
||||
_appHost = appHost;
|
||||
}
|
||||
|
||||
public IEnumerable<NotificationTypeInfo> GetNotificationTypes()
|
||||
{
|
||||
var knownTypes = new List<NotificationTypeInfo>
|
||||
{
|
||||
new NotificationTypeInfo
|
||||
{
|
||||
Type = NotificationType.ApplicationUpdateAvailable.ToString(),
|
||||
DefaultTitle = "A new version of Media Browser Server is available for download."
|
||||
},
|
||||
|
||||
new NotificationTypeInfo
|
||||
{
|
||||
Type = NotificationType.ApplicationUpdateInstalled.ToString(),
|
||||
@@ -104,6 +101,15 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
}
|
||||
};
|
||||
|
||||
if (!_appHost.CanSelfUpdate)
|
||||
{
|
||||
knownTypes.Add(new NotificationTypeInfo
|
||||
{
|
||||
Type = NotificationType.ApplicationUpdateAvailable.ToString(),
|
||||
DefaultTitle = "A new version of Media Browser Server is available for download."
|
||||
});
|
||||
}
|
||||
|
||||
foreach (var type in knownTypes)
|
||||
{
|
||||
Update(type);
|
||||
|
||||
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Configuration;
|
||||
using MediaBrowser.Controller.Entities;
|
||||
using MediaBrowser.Controller.Library;
|
||||
using MediaBrowser.Controller.Notifications;
|
||||
using MediaBrowser.Model.Configuration;
|
||||
using MediaBrowser.Model.Logging;
|
||||
using MediaBrowser.Model.Notifications;
|
||||
using System;
|
||||
@@ -31,11 +32,15 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
|
||||
public Task SendNotification(NotificationRequest request, CancellationToken cancellationToken)
|
||||
{
|
||||
var users = request.UserIds.Select(i => _userManager.GetUserById(new Guid(i)));
|
||||
|
||||
var notificationType = request.NotificationType;
|
||||
|
||||
var title = GetTitle(request);
|
||||
var options = string.IsNullOrWhiteSpace(notificationType) ?
|
||||
null :
|
||||
_config.Configuration.NotificationOptions.GetOptions(notificationType);
|
||||
|
||||
var users = GetUserIds(request, options).Select(i => _userManager.GetUserById(new Guid(i)));
|
||||
|
||||
var title = GetTitle(request, options);
|
||||
|
||||
var tasks = _services.Where(i => IsEnabled(i, notificationType))
|
||||
.Select(i => SendNotification(request, i, users, title, cancellationToken));
|
||||
@@ -58,6 +63,43 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
|
||||
}
|
||||
|
||||
private IEnumerable<string> GetUserIds(NotificationRequest request, NotificationOption options)
|
||||
{
|
||||
if (request.SendToUserMode.HasValue)
|
||||
{
|
||||
switch (request.SendToUserMode.Value)
|
||||
{
|
||||
case SendToUserType.Admins:
|
||||
return _userManager.Users.Where(i => i.Configuration.IsAdministrator)
|
||||
.Select(i => i.Id.ToString("N"));
|
||||
case SendToUserType.All:
|
||||
return _userManager.Users.Select(i => i.Id.ToString("N"));
|
||||
case SendToUserType.Custom:
|
||||
return request.UserIds;
|
||||
default:
|
||||
throw new ArgumentException("Unrecognized SendToUserMode: " + request.SendToUserMode.Value);
|
||||
}
|
||||
}
|
||||
|
||||
if (options != null)
|
||||
{
|
||||
switch (options.SendToUserMode)
|
||||
{
|
||||
case SendToUserType.Admins:
|
||||
return _userManager.Users.Where(i => i.Configuration.IsAdministrator)
|
||||
.Select(i => i.Id.ToString("N"));
|
||||
case SendToUserType.All:
|
||||
return _userManager.Users.Select(i => i.Id.ToString("N"));
|
||||
case SendToUserType.Custom:
|
||||
return options.SendToUsers;
|
||||
default:
|
||||
throw new ArgumentException("Unrecognized SendToUserMode: " + options.SendToUserMode);
|
||||
}
|
||||
}
|
||||
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
private async Task SendNotification(NotificationRequest request,
|
||||
INotificationService service,
|
||||
string title,
|
||||
@@ -86,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
}
|
||||
}
|
||||
|
||||
private string GetTitle(NotificationRequest request)
|
||||
private string GetTitle(NotificationRequest request, NotificationOption options)
|
||||
{
|
||||
var title = request.Name;
|
||||
|
||||
@@ -95,8 +137,6 @@ namespace MediaBrowser.Server.Implementations.Notifications
|
||||
{
|
||||
if (!string.IsNullOrEmpty(request.NotificationType))
|
||||
{
|
||||
var options = _config.Configuration.NotificationOptions.GetOptions(request.NotificationType);
|
||||
|
||||
if (options != null)
|
||||
{
|
||||
title = options.Title;
|
||||
|
||||
Reference in New Issue
Block a user