diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-01-07 00:47:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 00:47:06 -0500 |
| commit | c986340c02cb0b7fe06569d25a1b5d1c8375f7f6 (patch) | |
| tree | 4971c970bbdb797cc5b3da2d8bae506231b173a5 /MediaBrowser.Model/Notifications | |
| parent | 76b647e0a8eddd65dc9c4de7b887a3faf6e12bcc (diff) | |
| parent | 0b804629b85498370c882f5562dfc7acd84bfd11 (diff) | |
Merge pull request #419 from jellyfin/dev
Master 10.0.0
Diffstat (limited to 'MediaBrowser.Model/Notifications')
4 files changed, 6 insertions, 41 deletions
diff --git a/MediaBrowser.Model/Notifications/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs index cda9e311df..ce49ae2090 100644 --- a/MediaBrowser.Model/Notifications/NotificationOption.cs +++ b/MediaBrowser.Model/Notifications/NotificationOption.cs @@ -21,18 +21,6 @@ namespace MediaBrowser.Model.Notifications /// </summary> /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value> public bool Enabled { get; set; } - - /// <summary> - /// Gets or sets the title format string. - /// </summary> - /// <value>The title format string.</value> - public string Title { get; set; } - - /// <summary> - /// Gets or sets the description. - /// </summary> - /// <value>The description.</value> - public string Description { get; set; } /// <summary> /// Gets or sets the disabled services. @@ -48,9 +36,9 @@ namespace MediaBrowser.Model.Notifications public NotificationOption() { - DisabledServices = new string[] {}; - DisabledMonitorUsers = new string[] {}; - SendToUsers = new string[] {}; + DisabledServices = Array.Empty<string>(); + DisabledMonitorUsers = Array.Empty<string>(); + SendToUsers = Array.Empty<string>(); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs index 9c89e40fbd..7fa57ca9a3 100644 --- a/MediaBrowser.Model/Notifications/NotificationRequest.cs +++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace MediaBrowser.Model.Notifications { @@ -22,8 +21,6 @@ namespace MediaBrowser.Model.Notifications /// </summary> public string NotificationType { get; set; } - public Dictionary<string, string> Variables { get; set; } - public SendToUserType? SendToUserMode { get; set; } public NotificationRequest() diff --git a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs deleted file mode 100644 index 0ffe7d4ae9..0000000000 --- a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MediaBrowser.Model.Notifications -{ - public class NotificationServiceInfo - { - public string Name { get; set; } - public string Id { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs index 4c3283d8e9..203712fa8c 100644 --- a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs +++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System; +using System; namespace MediaBrowser.Model.Notifications { @@ -14,16 +13,5 @@ namespace MediaBrowser.Model.Notifications public string Category { get; set; } public bool IsBasedOnUserEvent { get; set; } - - public string DefaultTitle { get; set; } - - public string DefaultDescription { get; set; } - - public string[] Variables { get; set; } - - public NotificationTypeInfo() - { - Variables = new string[] {}; - } } -}
\ No newline at end of file +} |