alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-26 18:48:21 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into userdb-efcore

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
This commit is contained in:
Patrick Barron
2020-06-04 16:39:50 -04:00
parent 585fdbad39 836741f2aa
commit 06f9cde22f
334 changed files with 2011 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Model/Notifications/NotificationOption.cs
View File

@@ -6,6 +6,15 @@ namespace MediaBrowser.Model.Notifications
{
public class NotificationOption
{
public NotificationOption(string type)
{
Type = type;
DisabledServices = Array.Empty<string>();
DisabledMonitorUsers = Array.Empty<string>();
SendToUsers = Array.Empty<string>();
}
public string Type { get; set; }
/// <summary>
@@ -35,12 +44,5 @@ namespace MediaBrowser.Model.Notifications
/// </summary>
/// <value>The send to user mode.</value>
public SendToUserType SendToUserMode { get; set; }
public NotificationOption()
{
DisabledServices = Array.Empty<string>();
DisabledMonitorUsers = Array.Empty<string>();
SendToUsers = Array.Empty<string>();
}
}
}

31
MediaBrowser.Model/Notifications/NotificationOptions.cs
View File

@@ -1,3 +1,4 @@
#nullable disable
#pragma warning disable CS1591
using System;
@@ -17,63 +18,53 @@ namespace MediaBrowser.Model.Notifications
{
Options = new[]
{
new NotificationOption
new NotificationOption(NotificationType.TaskFailed.ToString())
{
Type = NotificationType.TaskFailed.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ServerRestartRequired.ToString())
{
Type = NotificationType.ServerRestartRequired.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ApplicationUpdateAvailable.ToString())
{
Type = NotificationType.ApplicationUpdateAvailable.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.ApplicationUpdateInstalled.ToString())
{
Type = NotificationType.ApplicationUpdateInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginUpdateInstalled.ToString())
{
Type = NotificationType.PluginUpdateInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginUninstalled.ToString())
{
Type = NotificationType.PluginUninstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.InstallationFailed.ToString())
{
Type = NotificationType.InstallationFailed.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginInstalled.ToString())
{
Type = NotificationType.PluginInstalled.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.PluginError.ToString())
{
Type = NotificationType.PluginError.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
},
new NotificationOption
new NotificationOption(NotificationType.UserLockedOut.ToString())
{
Type = NotificationType.UserLockedOut.ToString(),
Enabled = true,
SendToUserMode = SendToUserType.Admins
}

1
MediaBrowser.Model/Notifications/NotificationRequest.cs
View File

@@ -1,3 +1,4 @@
#nullable disable
#pragma warning disable CS1591
using System;

1
MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
View File

@@ -1,3 +1,4 @@
#nullable disable
#pragma warning disable CS1591
namespace MediaBrowser.Model.Notifications