Merge pull request #5860 from cvium/fix-notification-user-list

Fix notification disabled users list
This commit is contained in:
Bond-009 2021-04-19 14:07:18 +02:00 committed by GitHub
commit ebe8301404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -93,16 +93,17 @@ namespace MediaBrowser.Model.Notifications
{ {
NotificationOption opt = GetOptions(notificationType); NotificationOption opt = GetOptions(notificationType);
return opt == null || return opt == null
!opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase); || !opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase);
} }
public bool IsEnabledToMonitorUser(string type, Guid userId) public bool IsEnabledToMonitorUser(string type, Guid userId)
{ {
NotificationOption opt = GetOptions(type); NotificationOption opt = GetOptions(type);
return opt != null && opt.Enabled && return opt != null
!opt.DisabledMonitorUsers.Contains(userId.ToString(string.Empty), StringComparer.OrdinalIgnoreCase); && opt.Enabled
&& !opt.DisabledMonitorUsers.Contains(userId.ToString("N"), StringComparer.OrdinalIgnoreCase);
} }
public bool IsEnabledToSendToUser(string type, string userId, User user) public bool IsEnabledToSendToUser(string type, string userId, User user)