diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-06-14 22:50:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 22:50:49 -0400 |
| commit | cf9223b8cb2f1ebccf20cb1dcd99d19b78cf3e61 (patch) | |
| tree | 95ec837fa654622732ba950859190bb3a16b8619 /MediaBrowser.Model/Notifications | |
| parent | e2b2f74b47cc1d281c0819795b83f8d49d1f3b09 (diff) | |
| parent | 524243a9340bfccd2c9ae708be70a5e49f5f53f1 (diff) | |
Merge pull request #3340 from crobibero/api-migration-merge
Merge master into api-migration
Diffstat (limited to 'MediaBrowser.Model/Notifications')
| -rw-r--r-- | MediaBrowser.Model/Notifications/NotificationOptions.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs index 9e570ef1c..239a3777e 100644 --- a/MediaBrowser.Model/Notifications/NotificationOptions.cs +++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs @@ -2,7 +2,10 @@ #pragma warning disable CS1591 using System; +using Jellyfin.Data.Enums; +using MediaBrowser.Model.Extensions; using System.Linq; +using Jellyfin.Data.Entities; using MediaBrowser.Model.Users; namespace MediaBrowser.Model.Notifications @@ -104,7 +107,7 @@ namespace MediaBrowser.Model.Notifications !opt.DisabledMonitorUsers.Contains(userId.ToString(""), StringComparer.OrdinalIgnoreCase); } - public bool IsEnabledToSendToUser(string type, string userId, UserPolicy userPolicy) + public bool IsEnabledToSendToUser(string type, string userId, User user) { NotificationOption opt = GetOptions(type); @@ -115,7 +118,7 @@ namespace MediaBrowser.Model.Notifications return true; } - if (opt.SendToUserMode == SendToUserType.Admins && userPolicy.IsAdministrator) + if (opt.SendToUserMode == SendToUserType.Admins && user.HasPermission(PermissionKind.IsAdministrator)) { return true; } |
